Skip to content

Commit 17a30b8

Browse files
bwspencbwspenc
committed
Remove deprecated syntax in ConcreteThermalMoisture closes #318 
1 parent 8ec98bd commit 17a30b8

File tree

1 file changed

+60
-137
lines changed

1 file changed

+60
-137
lines changed

‎src/materials/ConcreteThermalMoisture.C

Lines changed: 60 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -27,32 +27,6 @@ ConcreteThermalMoisture::validParams()
2727
params.addRequiredParam<std::string>(
2828
"type", "A string representing the Moose Object that is used to call this class");
2929

30-
// // parameters which will be deprecated soon
31-
MooseEnum thermal_capacity_model("CONSTANT ASCE-1992 KODUR-2004 EUROCODE-2004");
32-
MooseEnum thermal_conductivity_model("CONSTANT ASCE-1992 KODUR-2004 EUROCODE-2004 KIM-2003");
33-
params.addDeprecatedParam<MooseEnum>("thermal_capacity_model",
34-
thermal_capacity_model,
35-
"thermal capacity models",
36-
"Use thermal_model instead");
37-
params.addDeprecatedParam<MooseEnum>("thermal_conductivity_model",
38-
thermal_conductivity_model,
39-
"thermal conductivity models",
40-
"Use thermal_model instead");
41-
MooseEnum moisture_diffusivity_model("Bazant Xi Mensi");
42-
params.addDeprecatedParam<MooseEnum>("moisture_diffusivity_model",
43-
moisture_diffusivity_model,
44-
"moisture diffusivity models",
45-
"Use moisture_model instead");
46-
params.addDeprecatedParam<Real>("ref_density_of_concrete",
47-
"refernece density of porous media Kg/m^3",
48-
"Use ref_density instead");
49-
params.addDeprecatedParam<Real>("ref_specific_heat_of_concrete",
50-
"reference specific heat of concrete J/Kg/0C",
51-
"Use ref_specific_heat instead");
52-
params.addDeprecatedParam<Real>("ref_thermal_conductivity_of_concrete",
53-
"reference thermal conductivity of concrete W/m/0C",
54-
"Use ref_thermal_conductivity instead");
55-
5630
// available model for thermal and moisture transport
5731
MooseEnum thermal_model("CONSTANT ASCE-1992 KODUR-2004 EUROCODE-2004");
5832
params.addParam<MooseEnum>(
@@ -160,125 +134,74 @@ ConcreteThermalMoisture::ConcreteThermalMoisture(const InputParameters & paramet
160134
_has_temperature(isCoupled("temperature")),
161135
_temp(_has_temperature ? coupledValue("temperature") : _zero)
162136
{
163-
Real parameter_error_check = true;
164-
if (parameters.isParamSetByUser("thermal_capacity_model"))
137+
if (_thermal_model == "CONSTANT")
165138
{
166-
_thermal_model = getParam<MooseEnum>("thermal_capacity_model");
167-
_input_density = isParamValid("ref_density_of_concrete")
168-
? getParam<Real>("ref_density_of_concrete")
169-
: 2231.0;
170-
_input_specific_heat = isParamValid("ref_specific_heat_of_concrete")
171-
? getParam<Real>("ref_specific_heat_of_concrete")
172-
: 1100.0;
173-
_input_thermal_conductivity = isParamValid("ref_thermal_conductivity_of_concrete")
174-
? getParam<Real>("ref_thermal_conductivity_of_concrete")
175-
: 3.0;
176-
_aggregate_type = isParamValid("aggregate_type") ? getParam<MooseEnum>("aggregate_type") : 0;
177-
parameter_error_check = false;
139+
if (!parameters.isParamSetByUser("ref_density"))
140+
mooseError("For CONSTANT thermal_model, ref_density must be defined.");
141+
if (!parameters.isParamSetByUser("ref_specific_heat"))
142+
mooseError("For constant thermal transport model, ref_specific_heat must be defined.");
143+
if (!parameters.isParamSetByUser("ref_thermal_conductivity"))
144+
mooseError("For constant thermal transport model, ref_thermal_conductivity must be defined.");
178145
}
179-
if (parameter_error_check)
146+
else if (_thermal_model == "ASCE-1992")
180147
{
181-
if (_thermal_model == "CONSTANT")
182-
{
183-
if (!parameters.isParamSetByUser("ref_density"))
184-
mooseError("For CONSTANT thermal_model, ref_density must be defined.");
185-
if (!parameters.isParamSetByUser("ref_specific_heat"))
186-
mooseError("For constant thermal transport model, ref_specific_heat must be defined.");
187-
if (!parameters.isParamSetByUser("ref_thermal_conductivity"))
188-
mooseError(
189-
"For constant thermal transport model, ref_thermal_conductivity must be defined.");
190-
}
191-
else if (_thermal_model == "ASCE-1992")
192-
{
193-
if (!parameters.isParamSetByUser("aggregate_type"))
194-
mooseError("For ASCE-1992 thermal model, aggregate_type must be defined.");
195-
}
196-
else if (_thermal_model == "KODUR-2004")
197-
{
198-
if (!parameters.isParamSetByUser("aggregate_type"))
199-
mooseError("For KODUR-2004 thermal model, aggregate_type must be defined.");
200-
}
201-
else if (_thermal_model == "EUROCODE-2004")
202-
{
203-
if (!parameters.isParamSetByUser("ref_density"))
204-
mooseError("For EUROCODE-2004 thermal model, ref_density must be defined.");
205-
if (!parameters.isParamSetByUser("ref_specific_heat"))
206-
mooseError("For EUROCODE-2004 thermal model, ref_specific_heat must be defined.");
207-
}
148+
if (!parameters.isParamSetByUser("aggregate_type"))
149+
mooseError("For ASCE-1992 thermal model, aggregate_type must be defined.");
208150
}
209-
210-
parameter_error_check = true;
211-
212-
if (parameters.isParamSetByUser("moisture_diffusivity_model"))
151+
else if (_thermal_model == "KODUR-2004")
213152
{
214-
_moisture_model = getParam<MooseEnum>("moisture_diffusivity_model");
215-
_cement_mass = isParamValid("cement_mass") ? getParam<Real>("cement_mass") : 354.0;
216-
_water_to_cement =
217-
isParamValid("water_to_cement_ratio") ? getParam<Real>("water_to_cement_ratio") : 0.43;
218-
_cement_type = isParamValid("cement_type") ? getParam<MooseEnum>("cement_type") : 0;
219-
_aggregate_pore_type =
220-
isParamValid("aggregate_pore_type") ? getParam<MooseEnum>("aggregate_pore_type") : 0;
221-
_cure_time = isParamValid("concrete_cure_time") ? getParam<Real>("concrete_cure_time") : 23.0;
222-
_aggregate_mass = isParamValid("aggregate_mass") ? getParam<Real>("aggregate_mass") : 1877;
223-
_agg_vol_fraction =
224-
isParamValid("aggregate_vol_fraction") ? getParam<Real>("aggregate_vol_fraction") : 0.7;
225-
_D1 = isParamValid("D1") ? getParam<Real>("D1") : 3.0e-10;
226-
_Hc = isParamValid("critical_relative_humidity") ? getParam<Real>("critical_relative_humidity")
227-
: 0.75;
228-
_n_power = isParamValid("n") ? getParam<Real>("n") : 6.0;
229-
_alfa_Dht = isParamValid("coupled_moisture_diffusivity_factor")
230-
? getParam<Real>("coupled_moisture_diffusivity_factor")
231-
: 1.0e-5;
232-
_A = isParamValid("A") ? getParam<Real>("A") : 3.8e-13;
233-
_B = isParamValid("B") ? getParam<Real>("B") : 0.05;
234-
parameter_error_check = false;
153+
if (!parameters.isParamSetByUser("aggregate_type"))
154+
mooseError("For KODUR-2004 thermal model, aggregate_type must be defined.");
155+
}
156+
else if (_thermal_model == "EUROCODE-2004")
157+
{
158+
if (!parameters.isParamSetByUser("ref_density"))
159+
mooseError("For EUROCODE-2004 thermal model, ref_density must be defined.");
160+
if (!parameters.isParamSetByUser("ref_specific_heat"))
161+
mooseError("For EUROCODE-2004 thermal model, ref_specific_heat must be defined.");
235162
}
236163

237-
if (parameter_error_check)
164+
if (_moisture_model == "Bazant")
238165
{
239-
if (_moisture_model == "Bazant")
240-
{
241-
if (!parameters.isParamSetByUser("D1"))
242-
mooseError("For Bazant moisture model, empirical constant D1 must be defined.");
243-
if (!parameters.isParamSetByUser("n"))
244-
mooseError("For Bazant moisture model, empirical constant n must be defined.");
245-
if (!parameters.isParamSetByUser("critical_relative_humidity"))
246-
mooseError("For Bazant moisture model, critical_relative_humidity must be defined.");
247-
if (!parameters.isParamSetByUser("coupled_moisture_diffusivity_factor"))
248-
mooseError(
249-
"For Bazant moisture model, coupled_moisture_diffusivity_factor must be defined.");
250-
}
251-
else if (_moisture_model == "Mensi")
252-
{
253-
if (!parameters.isParamSetByUser("A"))
254-
mooseError("For Mensi moisture model, empirical constant A must be defined.");
255-
if (!parameters.isParamSetByUser("B"))
256-
mooseError("For Mensi moisture model, empirical constant B must be defined.");
257-
if (!parameters.isParamValid("cement_mass"))
258-
mooseError("For Mensi moisture model, cement_mass must be defined.");
259-
if (!parameters.isParamSetByUser("water_to_cement_ratio"))
260-
mooseError("For Mensi moisture model, water_to_cement_ratio must be defined.");
261-
}
262-
else if (_moisture_model == "Xi")
263-
{
264-
if (!parameters.isParamSetByUser("cement_type"))
265-
mooseError("For Xi moisture model, cement_type must be defined.");
266-
if (!parameters.isParamSetByUser("aggregate_pore_type"))
267-
mooseError("For Xi moisture model, aggregate_pore_type must be defined.");
268-
if (!parameters.isParamSetByUser("aggregate_vol_fraction"))
269-
mooseError("For Xi moisture model, aggregate_vol_fraction must be defined.");
270-
if (!parameters.isParamSetByUser("concrete_cure_time"))
271-
mooseError("For Xi moisture model, concrete_cure_time must be defined.");
272-
if (!parameters.isParamValid("cement_mass"))
273-
mooseError("For Xi moisture model, cement_mass must be defined.");
274-
if (!parameters.isParamSetByUser("aggregate_mass"))
275-
mooseError("For Xi moisture model, aggregate_mass must be defined.");
276-
if (!parameters.isParamSetByUser("water_to_cement_ratio"))
277-
mooseError("For Xi moisture model, water_to_cement_ratio must be defined.");
278-
if (_water_to_cement < 0.5)
279-
mooseError("For Xi's moisture model water_to_cement_ratio must be >= 0.5 to use Xi's model "
280-
"for moisture diffusivity");
281-
}
166+
if (!parameters.isParamSetByUser("D1"))
167+
mooseError("For Bazant moisture model, empirical constant D1 must be defined.");
168+
if (!parameters.isParamSetByUser("n"))
169+
mooseError("For Bazant moisture model, empirical constant n must be defined.");
170+
if (!parameters.isParamSetByUser("critical_relative_humidity"))
171+
mooseError("For Bazant moisture model, critical_relative_humidity must be defined.");
172+
if (!parameters.isParamSetByUser("coupled_moisture_diffusivity_factor"))
173+
mooseError("For Bazant moisture model, coupled_moisture_diffusivity_factor must be defined.");
174+
}
175+
else if (_moisture_model == "Mensi")
176+
{
177+
if (!parameters.isParamSetByUser("A"))
178+
mooseError("For Mensi moisture model, empirical constant A must be defined.");
179+
if (!parameters.isParamSetByUser("B"))
180+
mooseError("For Mensi moisture model, empirical constant B must be defined.");
181+
if (!parameters.isParamValid("cement_mass"))
182+
mooseError("For Mensi moisture model, cement_mass must be defined.");
183+
if (!parameters.isParamSetByUser("water_to_cement_ratio"))
184+
mooseError("For Mensi moisture model, water_to_cement_ratio must be defined.");
185+
}
186+
else if (_moisture_model == "Xi")
187+
{
188+
if (!parameters.isParamSetByUser("cement_type"))
189+
mooseError("For Xi moisture model, cement_type must be defined.");
190+
if (!parameters.isParamSetByUser("aggregate_pore_type"))
191+
mooseError("For Xi moisture model, aggregate_pore_type must be defined.");
192+
if (!parameters.isParamSetByUser("aggregate_vol_fraction"))
193+
mooseError("For Xi moisture model, aggregate_vol_fraction must be defined.");
194+
if (!parameters.isParamSetByUser("concrete_cure_time"))
195+
mooseError("For Xi moisture model, concrete_cure_time must be defined.");
196+
if (!parameters.isParamValid("cement_mass"))
197+
mooseError("For Xi moisture model, cement_mass must be defined.");
198+
if (!parameters.isParamSetByUser("aggregate_mass"))
199+
mooseError("For Xi moisture model, aggregate_mass must be defined.");
200+
if (!parameters.isParamSetByUser("water_to_cement_ratio"))
201+
mooseError("For Xi moisture model, water_to_cement_ratio must be defined.");
202+
if (_water_to_cement < 0.5)
203+
mooseError("For Xi's moisture model water_to_cement_ratio must be >= 0.5 to use Xi's model "
204+
"for moisture diffusivity");
282205
}
283206
}
284207

0 commit comments

Comments
 (0)