use background field to calculate adiabatic profile

geodynamics · Jun 4, 2024 · f9b090e · f9b090e
1 parent ecc67a9
commit f9b090e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/source/adiabatic_conditions/compute_entropy_profile.cc b/source/adiabatic_conditions/compute_entropy_profile.cc
@@ -74,19 +74,13 @@ namespace aspect
  in.requested_properties = MaterialModel::MaterialProperties::density | MaterialModel::MaterialProperties::additional_outputs;
  in.velocity[0] = Tensor <1,dim> ();
  // The entropy along an adiabat is constant (equals the surface entropy)
- // TODO : need to make it work for more than one entropy field
+ // When there are more than one entropy field, we use the background field to compute adiabat profile
  // TODO : provide more ways to specify compositional fields like in compute_profile.cc
  for (unsigned int i=0; i < this->n_compositional_fields(); ++i)
  in.composition[0][i] = 0;
 
  in.composition[0][entropy_indices[0]] = surface_entropy;
 
- if (this->introspection().composition_type_exists(CompositionalFieldDescription::Type::chemical_composition))
- {
- const std::vector<unsigned int> &chemical_indices = this->introspection().chemical_composition_field_indices();
- in.composition[0][chemical_indices[0]] = 1;
- }
-
  // Check whether gravity is pointing up / out or down / in. In the normal case it should
  // point down / in and therefore gravity should be positive, leading to increasing
  // adiabatic pressures and temperatures with depth. In some cases it will point up / out

diff --git a/tests/entropy_read_multi_table/solution/solution-00000.0000.gnuplot b/tests/entropy_read_multi_table/solution/solution-00000.0000.gnuplot