Remove deprecated syntax in tests ref idaholab#318

vprithiv · Dec 14, 2022 · fe3aa90 · fe3aa90
1 parent b4c9f15
commit fe3aa90
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 44 deletions.
diff --git a/assessment/asr_validation/wald2017b/analysis/A1-biaxial.i b/assessment/asr_validation/wald2017b/analysis/A1-biaxial.i
@@ -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

diff --git a/assessment/asr_validation/wald2017b/analysis/A1-triaxial.i b/assessment/asr_validation/wald2017b/analysis/A1-triaxial.i
@@ -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

diff --git a/assessment/asr_validation/wald2017b/analysis/A1-uniaxial.i b/assessment/asr_validation/wald2017b/analysis/A1-uniaxial.i
@@ -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

diff --git a/assessment/asr_validation/wald2017b/analysis/A1-unreinforced.i b/assessment/asr_validation/wald2017b/analysis/A1-unreinforced.i
@@ -1,6 +1,5 @@
 [GlobalParams]
   displacements = 'disp_x disp_y disp_z'
-  block = 1
 []
 
 [Problem]
@@ -20,7 +19,6 @@
   []
   [rh]
     initial_condition = 0.8
-    block = 1
   []
 []
 
@@ -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

diff --git a/assessment/asr_validation/wald2017b/analysis/A3-biaxial.i b/assessment/asr_validation/wald2017b/analysis/A3-biaxial.i
@@ -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

diff --git a/test/tests/concrete_ASR_swelling/asr_confined.i b/test/tests/concrete_ASR_swelling/asr_confined.i
@@ -3,12 +3,9 @@
   volumetric_locking_correction = true
 []
 
-[Problem]
-  coord_type = RZ
-[]
-
 [Mesh]
   file = mesh_contact_strip.e
+  coord_type = RZ
 []
 
 [Preconditioning]

diff --git a/test/tests/concrete_moisture_heat_transfer/maqbeth_1d.i b/test/tests/concrete_moisture_heat_transfer/maqbeth_1d.i
@@ -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]

diff --git a/test/tests/neml_benchmark/power_law_creep/nafems_test5a_lim.i b/test/tests/neml_benchmark/power_law_creep/nafems_test5a_lim.i
@@ -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
   [../]
 []

diff --git a/test/tests/neml_benchmark/power_law_creep/nafems_test5a_lim_neml.i b/test/tests/neml_benchmark/power_law_creep/nafems_test5a_lim_neml.i
@@ -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
   [../]
 []

diff --git a/test/tests/neml_stochasticSimple/stochastic_driver.i b/test/tests/neml_stochasticSimple/stochastic_driver.i
@@ -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]'
-
   []
 []