remove one lookup case from steinberger

geodynamics · Aug 25, 2023 · 94811c4 · 94811c4
1 parent 06ce805
commit 94811c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/source/material_model/steinberger.cc b/source/material_model/steinberger.cc
@@ -533,15 +533,12 @@ namespace aspect
           equation_of_state.parse_parameters(prm);
 
           // Assign background field and do some error checking
-          has_background_field = ((equation_of_state.number_of_lookups() == 1) ||
-                                  (equation_of_state.number_of_lookups() == this->introspection().n_chemical_composition_fields() + 1));
-          AssertThrow ((equation_of_state.number_of_lookups() == 1) ||
-                       (equation_of_state.number_of_lookups() == this->introspection().n_chemical_composition_fields()) ||
+          has_background_field = (equation_of_state.number_of_lookups() == this->introspection().n_chemical_composition_fields() + 1);
+          AssertThrow ((equation_of_state.number_of_lookups() == this->introspection().n_chemical_composition_fields()) ||
                        (equation_of_state.number_of_lookups() == this->introspection().n_chemical_composition_fields() + 1),
-                       ExcMessage("The Steinberger material model assumes that either there is a single material "
-                                  "in the simulation, or that all compositional fields of the type "
-                                  "chemical composition correspond to mass fractions of different "
-                                  "materials. There must either be one material lookup file, the same "
+                       ExcMessage("The Steinberger material model assumes that all compositional fields of the type "
+                                  "chemical composition (the default type) correspond to mass fractions of different "
+                                  "materials. There must either be the same "
                                   "number of material lookup files as compositional fields of type chemical "
                                   "composition, or one additional file (if a background field is used). You "
                                   "have "
@@ -554,15 +551,6 @@ namespace aspect
           std::vector<std::string> chemical_field_names = this->introspection().chemical_composition_field_names();
           std::vector<std::string> compositional_field_names = this->introspection().get_composition_names();
 
-          // If there is only one lookup, the list of Viscosity prefactors should have length one.
-          // The following if statement applies when defined fields of type chemical composition
-          // are not intended to be used as volume fractions of distinct materials.
-          if (equation_of_state.number_of_lookups() == 1)
-            {
-              chemical_field_names.clear();
-              compositional_field_names.clear();
-            }
-
           if (has_background_field)
             {
               chemical_field_names.insert(chemical_field_names.begin(),"background");

diff --git a/tests/steinberger_phases.prm b/tests/steinberger_phases.prm
@@ -2,7 +2,7 @@
 # It is intended to test the ability of the steinberger
 # material model to use the first data file as a background
 # composition, and ignore other compositional fields if
-# only a single material file is provided.
+# they do not have the type "chemical composition".
 
 set CFL number                             = 1.0
 set End time                               = 1e5
@@ -19,6 +19,7 @@ end
 
 subsection Compositional fields
   set Number of fields = 1
+  set Types of fields = generic
 end
 
 subsection Initial composition model

diff --git a/tests/steinberger_several_fields.prm b/tests/steinberger_several_fields.prm
@@ -1,8 +1,8 @@
 # This is a copy of the steinberger single field test.
 # It is intended to test the ability of the steinberger
 # material model to use the first data file as a background
-# composition, and ignore several other compositional
-# fields if only a single material file is provided.
+# composition, and ignore other compositional fields if
+# they do not have the type "chemical composition".
 
 set CFL number                             = 1.0
 set End time                               = 1e5
@@ -19,6 +19,7 @@ end
 
 subsection Compositional fields
   set Number of fields = 3
+  set Types of fields = generic, generic, generic
 end
 
 subsection Initial composition model