Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated syntax in tests #319

Merged
merged 1 commit into from
Nov 21, 2022
Merged

Remove deprecated syntax in tests #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions assessment/asr_validation/wald2017b/analysis/A1-biaxial.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,24 +469,24 @@
block = 1
# setup thermal property models and parameters
# options available: CONSTANT ASCE-1992 KODUR-2004 EUROCODE-2004 KIM-2003
thermal_conductivity_model = KODUR-2004
thermal_capacity_model = KODUR-2004
thermal_model = KODUR-2004
aggregate_type = Siliceous #options: Siliceous Carbonate

ref_density_of_concrete = 2231.0 # in kg/m^3
ref_specific_heat_of_concrete = 1100.0 # in J/(Kg.0C)
ref_thermal_conductivity_of_concrete = 3 # in W/(m.0C)
ref_density = 2231.0 # in kg/m^3
ref_specific_heat = 1100.0 # in J/(Kg.0C)
ref_thermal_conductivity = 3 # in W/(m.0C)

# setup moisture capacity and humidity diffusivity models
aggregate_pore_type = dense #options: dense porous
aggregate_mass = 1877.0 #mass of aggregate (kg) per m^3 of concrete
aggregate_vol_fraction = 0.7
cement_type = 1 #options: 1 2 3 4
cement_mass = 354.0 #mass of cement (kg) per m^3 of concrete
water_to_cement_ratio = 0.5
concrete_cure_time = 28.0 #curing time in (days)

# options available for humidity diffusivity:
moisture_diffusivity_model = Xi #options: Bazant Mensi
moisture_model = Xi #options: Bazant Mensi
D1 = 3.0e-8

coupled_moisture_diffusivity_factor = 1.0e-2 # factor for mositure diffusivity due to heat
Expand Down
12 changes: 6 additions & 6 deletions assessment/asr_validation/wald2017b/analysis/A1-triaxial.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,24 +509,24 @@
block = 1
# setup thermal property models and parameters
# options available: CONSTANT ASCE-1992 KODUR-2004 EUROCODE-2004 KIM-2003
thermal_conductivity_model = KODUR-2004
thermal_capacity_model = KODUR-2004
thermal_model = KODUR-2004
aggregate_type = Siliceous #options: Siliceous Carbonate

ref_density_of_concrete = 2231.0 # in kg/m^3
ref_specific_heat_of_concrete = 1100.0 # in J/(Kg.0C)
ref_thermal_conductivity_of_concrete = 3 # in W/(m.0C)
ref_density = 2231.0 # in kg/m^3
ref_specific_heat = 1100.0 # in J/(Kg.0C)
ref_thermal_conductivity = 3 # in W/(m.0C)

# setup moisture capacity and humidity diffusivity models
aggregate_pore_type = dense #options: dense porous
aggregate_mass = 1877.0 #mass of aggregate (kg) per m^3 of concrete
aggregate_vol_fraction = 0.7
cement_type = 1 #options: 1 2 3 4
cement_mass = 354.0 #mass of cement (kg) per m^3 of concrete
water_to_cement_ratio = 0.5
concrete_cure_time = 28.0 #curing time in (days)

# options available for humidity diffusivity:
moisture_diffusivity_model = Xi #options: Bazant Mensi
moisture_model = Xi #options: Bazant Mensi
D1 = 3.0e-8

coupled_moisture_diffusivity_factor = 1.0e-2 # factor for mositure diffusivity due to heat
Expand Down
12 changes: 6 additions & 6 deletions assessment/asr_validation/wald2017b/analysis/A1-uniaxial.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,24 +425,24 @@
block = 1
# setup thermal property models and parameters
# options available: CONSTANT ASCE-1992 KODUR-2004 EUROCODE-2004 KIM-2003
thermal_conductivity_model = KODUR-2004
thermal_capacity_model = KODUR-2004
thermal_model = KODUR-2004
aggregate_type = Siliceous #options: Siliceous Carbonate

ref_density_of_concrete = 2231.0 # in kg/m^3
ref_specific_heat_of_concrete = 1100.0 # in J/(Kg.0C)
ref_thermal_conductivity_of_concrete = 3 # in W/(m.0C)
ref_density = 2231.0 # in kg/m^3
ref_specific_heat = 1100.0 # in J/(Kg.0C)
ref_thermal_conductivity = 3 # in W/(m.0C)

# setup moisture capacity and humidity diffusivity models
aggregate_pore_type = dense #options: dense porous
aggregate_mass = 1877.0 #mass of aggregate (kg) per m^3 of concrete
aggregate_vol_fraction = 0.7
cement_type = 1 #options: 1 2 3 4
cement_mass = 354.0 #mass of cement (kg) per m^3 of concrete
water_to_cement_ratio = 0.5
concrete_cure_time = 28.0 #curing time in (days)

# options available for humidity diffusivity:
moisture_diffusivity_model = Xi #options: Bazant Mensi
moisture_model = Xi #options: Bazant Mensi
D1 = 3.0e-8

coupled_moisture_diffusivity_factor = 1.0e-2 # factor for mositure diffusivity due to heat
Expand Down
14 changes: 6 additions & 8 deletions assessment/asr_validation/wald2017b/analysis/A1-unreinforced.i
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[GlobalParams]
displacements = 'disp_x disp_y disp_z'
block = 1
[]

[Problem]
Expand All @@ -20,7 +19,6 @@
[]
[rh]
initial_condition = 0.8
block = 1
[]
[]

Expand Down Expand Up @@ -282,24 +280,24 @@
type = ConcreteThermalMoisture
# setup thermal property models and parameters
# options available: CONSTANT ASCE-1992 KODUR-2004 EUROCODE-2004 KIM-2003
thermal_conductivity_model = KODUR-2004
thermal_capacity_model = KODUR-2004
thermal_model = KODUR-2004
aggregate_type = Siliceous #options: Siliceous Carbonate

ref_density_of_concrete = 2231.0 # in kg/m^3
ref_specific_heat_of_concrete = 1100.0 # in J/(Kg.0C)
ref_thermal_conductivity_of_concrete = 3 # in W/(m.0C)
ref_density = 2231.0 # in kg/m^3
ref_specific_heat = 1100.0 # in J/(Kg.0C)
ref_thermal_conductivity = 3 # in W/(m.0C)

# setup moisture capacity and humidity diffusivity models
aggregate_pore_type = dense #options: dense porous
aggregate_mass = 1877.0 #mass of aggregate (kg) per m^3 of concrete
aggregate_vol_fraction = 0.7
cement_type = 1 #options: 1 2 3 4
cement_mass = 354.0 #mass of cement (kg) per m^3 of concrete
water_to_cement_ratio = 0.5
concrete_cure_time = 28.0 #curing time in (days)

# options available for humidity diffusivity:
moisture_diffusivity_model = Xi #options: Bazant Mensi
moisture_model = Xi #options: Bazant Mensi
D1 = 3.0e-8

coupled_moisture_diffusivity_factor = 1.0e-2 # factor for mositure diffusivity due to heat
Expand Down
12 changes: 6 additions & 6 deletions assessment/asr_validation/wald2017b/analysis/A3-biaxial.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,24 +468,24 @@
block = 1
# setup thermal property models and parameters
# options available: CONSTANT ASCE-1992 KODUR-2004 EUROCODE-2004 KIM-2003
thermal_conductivity_model = KODUR-2004
thermal_capacity_model = KODUR-2004
thermal_model = KODUR-2004
aggregate_type = Siliceous #options: Siliceous Carbonate

ref_density_of_concrete = 2231.0 # in kg/m^3
ref_specific_heat_of_concrete = 1100.0 # in J/(Kg.0C)
ref_thermal_conductivity_of_concrete = 3 # in W/(m.0C)
ref_density = 2231.0 # in kg/m^3
ref_specific_heat = 1100.0 # in J/(Kg.0C)
ref_thermal_conductivity = 3 # in W/(m.0C)

# setup moisture capacity and humidity diffusivity models
aggregate_pore_type = dense #options: dense porous
aggregate_mass = 1877.0 #mass of aggregate (kg) per m^3 of concrete
aggregate_vol_fraction = 0.7
cement_type = 1 #options: 1 2 3 4
cement_mass = 354.0 #mass of cement (kg) per m^3 of concrete
water_to_cement_ratio = 0.5
concrete_cure_time = 28.0 #curing time in (days)

# options available for humidity diffusivity:
moisture_diffusivity_model = Xi #options: Bazant Mensi
moisture_model = Xi #options: Bazant Mensi
D1 = 3.0e-8

coupled_moisture_diffusivity_factor = 1.0e-2 # factor for mositure diffusivity due to heat
Expand Down
5 changes: 1 addition & 4 deletions test/tests/concrete_ASR_swelling/asr_confined.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
volumetric_locking_correction = true
[]

[Problem]
coord_type = RZ
[]

[Mesh]
file = mesh_contact_strip.e
coord_type = RZ
[]

[Preconditioning]
Expand Down
2 changes: 1 addition & 1 deletion test/tests/concrete_moisture_heat_transfer/maqbeth_1d.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
type = ReferenceResidualProblem
reference_vector = 'ref'
extra_tag_vectors = 'ref'
coord_type = RZ
[]

[Mesh]
file = maqbeth_1d.e
construct_side_list_from_node_list = true
coord_type = RZ
[]

[Functions]
Expand Down
2 changes: 0 additions & 2 deletions test/tests/neml_benchmark/power_law_creep/nafems_test5a_lim.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,12 @@
type = Pressure
variable = disp_y
boundary = top
component = 1
factor = -100.0
[../]
[./side_press]
type = Pressure
variable = disp_x
boundary = right
component = 0
factor = -200.0
[../]
[]
Expand Down
2 changes: 0 additions & 2 deletions test/tests/neml_benchmark/power_law_creep/nafems_test5a_lim_neml.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,12 @@
type = Pressure
variable = disp_y
boundary = top
component = 1
factor = -100.0
[../]
[./side_press]
type = Pressure
variable = disp_x
boundary = right
component = 0
factor = -200.0
[../]
[]
Expand Down
4 changes: 1 addition & 3 deletions test/tests/neml_stochasticSimple/stochastic_driver.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,10 @@

[Controls]
[cmdLine]
type = MultiAppCommandLineControl
type = MultiAppSamplerControl
multi_app = sub
sampler = neml_values

param_names='Materials/stress/neml_variable_value[0,1]'

[]
[]

Expand Down