Skip to content

Commit 3a91bde

Browse files
tjheitjhei
authoredOct 25, 2024
Merge pull request geodynamics#6108 from gassmoeller/enable_deprecated_checks
Enable deprecation warnings in tester
2 parents 08d2d0d + e10867b commit 3a91bde

13 files changed

+429
-458
lines changed
 

‎.github/workflows/linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
mkdir build-no-unity
4040
cd build-no-unity
41-
cmake -D CMAKE_BUILD_TYPE=Debug -D ASPECT_PRECOMPILE_HEADERS=OFF -D ASPECT_UNITY_BUILD=OFF -D CMAKE_CXX_FLAGS='-Werror' ..
41+
cmake -D CMAKE_BUILD_TYPE=Debug -D ASPECT_PRECOMPILE_HEADERS=OFF -D ASPECT_UNITY_BUILD=OFF -D CMAKE_CXX_FLAGS='-Werror' -D ASPECT_ADDITIONAL_CXX_FLAGS='-Wdeprecated-declarations' ..
4242
make -j 4
4343
./aspect --test
4444
@@ -130,7 +130,7 @@ jobs:
130130
-D CMAKE_BUILD_TYPE=Debug \
131131
-G 'Ninja' \
132132
-D CMAKE_CXX_FLAGS='-Werror' \
133-
-D ASPECT_ADDITIONAL_CXX_FLAGS='-O3' \
133+
-D ASPECT_ADDITIONAL_CXX_FLAGS='-O3 -Wdeprecated-declarations' \
134134
-D ASPECT_TEST_GENERATOR='Ninja' \
135135
-D ASPECT_PRECOMPILE_HEADERS=ON \
136136
-D ASPECT_UNITY_BUILD=ON \

‎source/material_model/diffusion_dislocation.cc

+4-6
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,13 @@ namespace aspect
142142
// Establish that a background field is required here
143143
chemical_field_names.insert(chemical_field_names.begin(),"background");
144144

145-
Utilities::MapParsing::Options options(chemical_field_names, "Densities");
145+
Utilities::MapParsing::Options options(chemical_field_names, "");
146146
options.list_of_allowed_keys = compositional_field_names;
147-
148-
densities = Utilities::MapParsing::parse_map_to_double_array (prm.get("Densities"),
149-
options);
147+
options.property_name = "Densities";
148+
densities = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
150149

151150
options.property_name = "Thermal expansivities";
152-
thermal_expansivities = Utilities::MapParsing::parse_map_to_double_array (prm.get("Thermal expansivities"),
153-
options);
151+
thermal_expansivities = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
154152

155153
// Phenomenological parameters
156154
thermal_diffusivity = prm.get_double("Thermal diffusivity");

‎source/material_model/equation_of_state/multicomponent_compressible.cc

+20-33
Original file line numberDiff line numberDiff line change
@@ -117,42 +117,29 @@ namespace aspect
117117
void
118118
MulticomponentCompressible<dim>::parse_parameters (ParameterHandler &prm)
119119
{
120+
std::vector<std::string> compositional_field_names = this->introspection().get_composition_names();
120121
// Establish that a background field is required here
121-
const bool has_background_field = true;
122-
123-
// Retrieve the list of composition names
124-
const std::vector<std::string> list_of_composition_names = this->introspection().get_composition_names();
122+
compositional_field_names.insert(compositional_field_names.begin(),"background");
123+
Utilities::MapParsing::Options options(compositional_field_names, "");
125124

126125
// Parse multicomponent properties
127-
reference_temperatures = Utilities::parse_map_to_double_array (prm.get("Reference temperatures"),
128-
list_of_composition_names,
129-
has_background_field,
130-
"Reference temperatures");
131-
132-
reference_densities = Utilities::parse_map_to_double_array (prm.get("Reference densities"),
133-
list_of_composition_names,
134-
has_background_field,
135-
"Reference densities");
136-
137-
reference_isothermal_compressibilities = Utilities::parse_map_to_double_array (prm.get("Reference isothermal compressibilities"),
138-
list_of_composition_names,
139-
has_background_field,
140-
"Reference isothermal compressibilities");
141-
142-
isothermal_bulk_modulus_pressure_derivatives = Utilities::parse_map_to_double_array (prm.get("Isothermal bulk modulus pressure derivatives"),
143-
list_of_composition_names,
144-
has_background_field,
145-
"Isothermal bulk modulus pressure derivatives");
146-
147-
reference_thermal_expansivities = Utilities::parse_map_to_double_array (prm.get("Reference thermal expansivities"),
148-
list_of_composition_names,
149-
has_background_field,
150-
"Reference thermal expansivities");
151-
152-
isochoric_specific_heats = Utilities::parse_map_to_double_array (prm.get("Isochoric specific heats"),
153-
list_of_composition_names,
154-
has_background_field,
155-
"Isochoric specific heats");
126+
options.property_name = "Reference temperatures";
127+
reference_temperatures = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
128+
129+
options.property_name = "Reference densities";
130+
reference_densities = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
131+
132+
options.property_name = "Reference isothermal compressibilities";
133+
reference_isothermal_compressibilities = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
134+
135+
options.property_name = "Isothermal bulk modulus pressure derivatives";
136+
isothermal_bulk_modulus_pressure_derivatives = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
137+
138+
options.property_name = "Reference thermal expansivities";
139+
reference_thermal_expansivities = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
140+
141+
options.property_name = "Isochoric specific heats";
142+
isochoric_specific_heats = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
156143
}
157144
}
158145
}

‎source/material_model/melt_boukare.cc

+42-69
Original file line numberDiff line numberDiff line change
@@ -1170,75 +1170,48 @@ namespace aspect
11701170
AssertThrow (false, ExcNotImplemented());
11711171
}
11721172

1173-
molar_masses = Utilities::parse_map_to_double_array (prm.get("Molar masses"),
1174-
endmember_names,
1175-
false,
1176-
"Molar masses");
1177-
1178-
number_of_atoms = Utilities::parse_map_to_double_array (prm.get("Number of atoms"),
1179-
endmember_names,
1180-
false,
1181-
"Number of atoms");
1182-
1183-
reference_volumes = Utilities::parse_map_to_double_array (prm.get("Reference volumes"),
1184-
endmember_names,
1185-
false,
1186-
"Reference volumes");
1187-
1188-
reference_thermal_expansivities = Utilities::parse_map_to_double_array (prm.get("Reference thermal expansivities"),
1189-
endmember_names,
1190-
false,
1191-
"Reference thermal expansivities");
1192-
1193-
reference_bulk_moduli = Utilities::parse_map_to_double_array (prm.get("Reference bulk moduli"),
1194-
endmember_names,
1195-
false,
1196-
"Reference bulk moduli");
1197-
1198-
bulk_modulus_pressure_derivatives = Utilities::parse_map_to_double_array (prm.get("First derivatives of the bulk modulus"),
1199-
endmember_names,
1200-
false,
1201-
"First derivatives of the bulk modulus");
1202-
1203-
bulk_modulus_second_pressure_derivatives = Utilities::parse_map_to_double_array (prm.get("Second derivatives of the bulk modulus"),
1204-
endmember_names,
1205-
false,
1206-
"Second derivatives of the bulk modulus");
1207-
1208-
Einstein_temperatures = Utilities::parse_map_to_double_array (prm.get("Einstein temperatures"),
1209-
endmember_names,
1210-
false,
1211-
"Einstein temperatures");
1212-
1213-
reference_enthalpies = Utilities::parse_map_to_double_array (prm.get("Reference enthalpies"),
1214-
endmember_names,
1215-
false,
1216-
"Reference enthalpies");
1217-
1218-
reference_entropies = Utilities::parse_map_to_double_array (prm.get("Reference entropies"),
1219-
endmember_names,
1220-
false,
1221-
"Reference entropies");
1222-
1223-
reference_specific_heats = Utilities::parse_map_to_double_array (prm.get("Reference specific heat capacities"),
1224-
endmember_names,
1225-
false,
1226-
"Reference specific heat capacities");
1227-
1228-
specific_heat_linear_coefficients = Utilities::parse_map_to_double_array (prm.get("Linear coefficients for specific heat polynomial"),
1229-
endmember_names,
1230-
false,
1231-
"Linear coefficients for specific heat polynomial");
1232-
1233-
specific_heat_second_coefficients = Utilities::parse_map_to_double_array (prm.get("Second coefficients for specific heat polynomial"),
1234-
endmember_names,
1235-
false,
1236-
"Second coefficients for specific heat polynomial");
1237-
1238-
specific_heat_third_coefficients = Utilities::parse_map_to_double_array (prm.get("Third coefficients for specific heat polynomial"),
1239-
endmember_names,
1240-
false,
1241-
"Third coefficients for specific heat polynomial");
1173+
Utilities::MapParsing::Options options(endmember_names, "");
1174+
options.property_name = "Molar masses";
1175+
molar_masses = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1176+
1177+
options.property_name = "Number of atoms";
1178+
number_of_atoms = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1179+
1180+
options.property_name = "Reference volumes";
1181+
reference_volumes = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1182+
1183+
options.property_name = "Reference thermal expansivities";
1184+
reference_thermal_expansivities = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1185+
1186+
options.property_name = "Reference bulk moduli";
1187+
reference_bulk_moduli = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1188+
1189+
options.property_name = "First derivatives of the bulk modulus";
1190+
bulk_modulus_pressure_derivatives = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1191+
1192+
options.property_name = "Second derivatives of the bulk modulus";
1193+
bulk_modulus_second_pressure_derivatives = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1194+
1195+
options.property_name = "Einstein temperatures";
1196+
Einstein_temperatures = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1197+
1198+
options.property_name = "Reference enthalpies";
1199+
reference_enthalpies = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1200+
1201+
options.property_name = "Reference entropies";
1202+
reference_entropies = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1203+
1204+
options.property_name = "Reference specific heat capacities";
1205+
reference_specific_heats = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1206+
1207+
options.property_name = "Linear coefficients for specific heat polynomial";
1208+
specific_heat_linear_coefficients = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1209+
1210+
options.property_name = "Second coefficients for specific heat polynomial";
1211+
specific_heat_second_coefficients = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
1212+
1213+
options.property_name = "Third coefficients for specific heat polynomial";
1214+
specific_heat_third_coefficients = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
12421215

12431216
// Check all lists have the correct length.
12441217
AssertThrow(endmember_names.size() == endmember_states.size(),

‎source/material_model/multicomponent_compressible.cc

+7-12
Original file line numberDiff line numberDiff line change
@@ -126,21 +126,16 @@ namespace aspect
126126
viscosity_averaging = MaterialUtilities::parse_compositional_averaging_operation ("Viscosity averaging scheme",
127127
prm);
128128

129+
std::vector<std::string> compositional_field_names = this->introspection().get_composition_names();
129130
// Establish that a background field is required here
130-
const bool has_background_field = true;
131+
compositional_field_names.insert(compositional_field_names.begin(),"background");
132+
Utilities::MapParsing::Options options(compositional_field_names, "");
131133

132-
// Retrieve the list of composition names
133-
const std::vector<std::string> list_of_composition_names = this->introspection().get_composition_names();
134+
options.property_name = "Viscosities";
135+
viscosities = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
134136

135-
viscosities = Utilities::parse_map_to_double_array (prm.get("Viscosities"),
136-
list_of_composition_names,
137-
has_background_field,
138-
"Viscosities");
139-
140-
thermal_conductivities = Utilities::parse_map_to_double_array (prm.get("Thermal conductivities"),
141-
list_of_composition_names,
142-
has_background_field,
143-
"Thermal conductivities");
137+
options.property_name = "Thermal conductivities";
138+
thermal_conductivities = Utilities::MapParsing::parse_map_to_double_array (prm.get(options.property_name), options);
144139
}
145140
prm.leave_subsection();
146141
}

0 commit comments

Comments
 (0)