diff --git a/doc/modules/changes/20220630_haoyuan b/doc/modules/changes/20220630_haoyuan index 9e8d2d72f60..43135760ae0 100644 --- a/doc/modules/changes/20220630_haoyuan +++ b/doc/modules/changes/20220630_haoyuan @@ -1,5 +1,8 @@ New: The values of the properties of material phases can be entered -by the differences between adjacent phases. Besides, there are two ways -to input these values of differences: arithmetic and logarithmic. +by the differences between adjacent phases. If this is the case, +then all the phase properties need to be entered by a value for the first phase +followed by M-1 values for the differences between adjacent phases. +Also note that the quotients rather than the differences are used +for the "Prefactors" in the flow laws.
(Haoyuan Li, 2022/06/30) \ No newline at end of file diff --git a/include/aspect/material_model/equation_of_state/multicomponent_incompressible.h b/include/aspect/material_model/equation_of_state/multicomponent_incompressible.h index 6b7c927b349..9ec00cc5516 100644 --- a/include/aspect/material_model/equation_of_state/multicomponent_incompressible.h +++ b/include/aspect/material_model/equation_of_state/multicomponent_incompressible.h @@ -98,8 +98,9 @@ namespace aspect private: /** * Whether to define the phase properties based on the exact values, or the value differences. - * Based on this parameter, inputs will be either the exact values, one for each phase, or a value for the first phase - * for each composition followed by differences between adjacent phases. + * Based on this parameter, either M values, one for each phase, or a value for the first phase + * followed by M-1 values for the differences between adjacent phases will be used to define + * the phase properties. */ bool use_values_instead_of_differences; diff --git a/include/aspect/material_model/rheology/dislocation_creep.h b/include/aspect/material_model/rheology/dislocation_creep.h index 6d6057dd886..f326e7b5304 100644 --- a/include/aspect/material_model/rheology/dislocation_creep.h +++ b/include/aspect/material_model/rheology/dislocation_creep.h @@ -139,8 +139,9 @@ namespace aspect /** * Whether to define the phase properties based on the exact values, or the value differences. - * Based on this parameter, inputs will be either the exact values, one for each phase, or a value for the first phase - * for each composition followed by differences between adjacent phases. + * Based on this parameter, either M values, one for each phase, or a value for the first phase + * followed by M-1 values for the differences between adjacent phases will be used to define + * the phase properties. */ bool use_values_instead_of_differences; diff --git a/include/aspect/material_model/rheology/drucker_prager.h b/include/aspect/material_model/rheology/drucker_prager.h index 70205241cdc..9955c8abe74 100644 --- a/include/aspect/material_model/rheology/drucker_prager.h +++ b/include/aspect/material_model/rheology/drucker_prager.h @@ -142,8 +142,9 @@ namespace aspect /** * Whether to define the phase properties based on the exact values, or the value differences. - * Based on this parameter, inputs will be either the exact values, one for each phase, or a value for the first phase - * for each composition followed by differences between adjacent phases. + * Based on this parameter, either M values, one for each phase, or a value for the first phase + * followed by M-1 values for the differences between adjacent phases will be used to define + * the phase properties. */ bool use_values_instead_of_differences; }; diff --git a/include/aspect/material_model/utilities.h b/include/aspect/material_model/utilities.h index 4f06abe1ac5..738cc50b84f 100644 --- a/include/aspect/material_model/utilities.h +++ b/include/aspect/material_model/utilities.h @@ -555,7 +555,8 @@ namespace aspect * is added to the logarithmic of the previous phase's value. */ std::vector - parse_map_differences_to_values( const std::vector , const std::unique_ptr> &, + parse_map_differences_to_values( const std::vector, + const std::unique_ptr> &, const PhaseUtilities::PhaseAveragingOperation=PhaseUtilities::arithmetic); } diff --git a/include/aspect/utilities.h b/include/aspect/utilities.h index bd2a148d72b..3b81639eef2 100644 --- a/include/aspect/utilities.h +++ b/include/aspect/utilities.h @@ -135,7 +135,12 @@ namespace aspect * @param [in] allow_missing_keys Whether to allow that some keys are * not set to any values, i.e. they do not appear at all in the * @p key_value_map. This also allows a completely empty map. - * + * @param [in] use_values_instead_of_differences Whether to define the + * phase properties based on the exact values rather than value differences. + * if this is false, then all the phase properties need to be entered by + * a value for the first phase followed by M-1 values for the differences + * between adjacent phases. Also note that the quotients rather than the + * differences are used for the "Prefactors" in the flow laws. * @return A vector of values that are parsed from the map, provided * in the order in which the keys appear in the @p list_of_keys argument. * If multiple values per key are allowed, the vector contains first all diff --git a/source/material_model/equation_of_state/multicomponent_incompressible.cc b/source/material_model/equation_of_state/multicomponent_incompressible.cc index ec242aade5e..21c9155ba24 100644 --- a/source/material_model/equation_of_state/multicomponent_incompressible.cc +++ b/source/material_model/equation_of_state/multicomponent_incompressible.cc @@ -97,7 +97,7 @@ namespace aspect "If only one value is given, then all use the same value. " "Units: \\si{\\joule\\per\\kelvin\\per\\kilogram}."); prm.declare_alias ("Heat capacities", "Specific heats"); - prm.declare_entry ("Define phase properties by exact values instead of differences", "true", + prm.declare_entry ("Define phase properties by differences instead of exact values", "true", Patterns::Bool (), "Whether to list phase transitions properties by differences between adjacent phases or an exact values on each phase." "If this parameter is true, " @@ -123,7 +123,7 @@ namespace aspect const std::vector list_of_composition_names = this->introspection().get_composition_names(); // Parse multicomponent properties - use_values_instead_of_differences = prm.get_bool("Define phase properties by exact values instead of differences"); + use_values_instead_of_differences = prm.get_bool("Define phase properties by differences instead of exact values"); std::vector density_inputs = Utilities::parse_map_to_double_array (prm.get("Densities"), list_of_composition_names, diff --git a/source/material_model/rheology/diffusion_creep.cc b/source/material_model/rheology/diffusion_creep.cc index 5aa6aa2292f..668541a0982 100644 --- a/source/material_model/rheology/diffusion_creep.cc +++ b/source/material_model/rheology/diffusion_creep.cc @@ -176,7 +176,7 @@ namespace aspect "Units: \\si{\\meter\\cubed\\per\\mole}."); prm.declare_entry ("Grain size", "1e-3", Patterns::Double (0.), "Units: \\si{\\meter}."); - prm.declare_entry ("Define phase properties by exact values instead of differences", "true", + prm.declare_entry ("Define phase properties by differences instead of exact values", "true", Patterns::Bool (), "Whether to list phase transitions properties by differences between adjacent phases or an exact values on each phase." "If this parameter is true, " @@ -200,7 +200,7 @@ namespace aspect const bool has_background_field = true; // Read parameters, each of size of number of composition + number of phases + 1 - use_values_instead_of_differences = prm.get_bool("Define phase properties by exact values instead of differences"); + use_values_instead_of_differences = prm.get_bool("Define phase properties by differences instead of exact values"); std::vector prefactors_diffusion_inputs = Utilities::parse_map_to_double_array(prm.get("Prefactors for diffusion creep"), list_of_composition_names, diff --git a/source/material_model/rheology/dislocation_creep.cc b/source/material_model/rheology/dislocation_creep.cc index fcb385ddb12..513e6c7e493 100644 --- a/source/material_model/rheology/dislocation_creep.cc +++ b/source/material_model/rheology/dislocation_creep.cc @@ -169,7 +169,7 @@ namespace aspect "for a total of N+1 values, where N is the number of compositional fields. " "If only one value is given, then all use the same value. " "Units: \\si{\\meter\\cubed\\per\\mole}."); - prm.declare_entry ("Define phase properties by exact values instead of differences", "true", + prm.declare_entry ("Define phase properties by differences instead of exact values", "true", Patterns::Bool (), "Whether to list phase transitions properties by differences between adjacent phases or an exact values on each phase." "If this parameter is true, " @@ -192,7 +192,7 @@ namespace aspect const bool has_background_field = true; // Read parameters, each of size of number of composition + number of phases + 1 - use_values_instead_of_differences = prm.get_bool("Define phase properties by exact values instead of differences"); + use_values_instead_of_differences = prm.get_bool("Define phase properties by differences instead of exact values"); std::vector prefactors_dislocation_inputs = Utilities::parse_map_to_double_array(prm.get("Prefactors for dislocation creep"), list_of_composition_names, has_background_field, diff --git a/source/material_model/rheology/drucker_prager.cc b/source/material_model/rheology/drucker_prager.cc index 6ac546a3135..b8527a7c1e7 100644 --- a/source/material_model/rheology/drucker_prager.cc +++ b/source/material_model/rheology/drucker_prager.cc @@ -195,7 +195,7 @@ namespace aspect prm.declare_entry ("Plastic damper viscosity", "0.0", Patterns::Double(0), "Viscosity of the damper that acts in parallel with the plastic viscosity " "to produce mesh-independent behavior at sufficient resolutions. Units: \\si{\\pascal\\second}"); - prm.declare_entry ("Define phase properties by exact values instead of differences", "true", + prm.declare_entry ("Define phase properties by differences instead of exact values", "true", Patterns::Bool (), "Whether to list phase transitions properties by differences between adjacent phases or an exact values on each phase." "If this parameter is true, " @@ -217,7 +217,7 @@ namespace aspect // Establish that a background field is required here const bool has_background_field = true; - use_values_instead_of_differences = prm.get_bool("Define phase properties by exact values instead of differences"); + use_values_instead_of_differences = prm.get_bool("Define phase properties by differences instead of exact values"); std::vector angles_internal_friction_inputs = Utilities::parse_map_to_double_array(prm.get("Angles of internal friction"), list_of_composition_names, diff --git a/tests/visco_plastic_phases_viscosity_jump.prm b/tests/visco_plastic_phases_viscosity_jump.prm index 299150801e0..c930d2a1cb7 100644 --- a/tests/visco_plastic_phases_viscosity_jump.prm +++ b/tests/visco_plastic_phases_viscosity_jump.prm @@ -83,7 +83,7 @@ subsection Material model set Phase transition widths = background:1e3|1e3, right:1e3|1e3 set Phase transition temperatures = background:273|273, right:273|273 set Phase transition Clapeyron slopes = background:0|0, right:0|0 - set Define phase properties by exact values instead of differences = false + set Define phase properties by differences instead of exact values = false set Densities = background:3300|100|100, right:3600|100|100 set Thermal expansivities = background:3.5e-5|-1.5e-5|-0.5e-5, right:3.5e-5|-1.5e-5|-0.5e-5 diff --git a/tests/visco_plastic_phases_viscosity_jump/solution/solution-00000.0000.vtu b/tests/visco_plastic_phases_viscosity_jump/solution/solution-00000.0000.vtu deleted file mode 100644 index e470c2a110b..00000000000 --- a/tests/visco_plastic_phases_viscosity_jump/solution/solution-00000.0000.vtu +++ /dev/null @@ -1,49 +0,0 @@ - - - - - -0 - - - - -AQAAADAqAAAwKgAAywYAAA==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 - - - - - -AQAAAAAZAAAAGQAArgcAAA==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 - - -AQAAAEAGAABABgAAFQIAAA==eNoNzyEXMQYAQFHbvu0IgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIwu457/6A9ycQCAQJESZClBhxEiRJkSZDlhx5ChQpUaZClRp1GjRp0aZDlx59BgwZMWbClBlzFixZsWbDlh17Dhw5cebClRt3Hjx58ebDlx+BvwKBPwQJESZClBhxEiRJkSZDlhx5ChQpUaZClRp1GjRp0aZDlx59BgwZMWbClBlzFixZsWbDlh17Dhw5cebClRt3Hjx58ebDlx+Bv/0TJESYCFFixEmQJEWaDFly5ClQpESZClVq1GnQpEWbDl169BkwZMSYCVNmzFmwZMWaDVt27Dlw5MSZC1du3Hnw5MWbD19+BP7xT5AQYSJEiREnQZIUaTJkyZGnQJESZSpUqVGnQZMWbTp06dFnwJARYyZMmTFnwZIVazZs2bHnwJETZy5cuXHnwZMXbz58+RH4I4KECBMhSow4CZKkSJMhS448BYqUKFOhSo06DZq0aNOhS48+A4aMGDNhyow5C5asWLNhy449B46cOHPhyo07D568ePPhy4/Av/4JEiJMhCgx4iRIkiJNhiw58hQoUqJMhSo16jRo0qJNhy49+gwYMmLMhCkz5ixYsmLNhi079hw4cuLMhSs37jx48uLNhy8/Av/5J0iIMBGixIiTIEmKNBmy5MjzP/zAw0c= - - -AQAAAJABAACQAQAADgAAAA==eNrj5BwFgwkAAAW9DhE= - - - - -AQAAADAqAAAwKgAAMA8AAA==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 - -AQAAABAOAAAQDgAA7QYAAA==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 - -AQAAABAOAAAQDgAAHwAAAA==eNrtwzENAAAIA7B5wxjnZCOENmm2E1VVVd891WyL6Q== - -AQAAABAOAAAQDgAAMgAAAA==eNrt0LEJAAAIA0E3czVHt7C2V7jAQ+qL+LrKafvX4syZM2fOnDlz5syZM+dbNaBeOWw= - -AQAAABAOAAAQDgAA0wAAAA==eNo7eyHK9ewQxLaTcsEYF3uwYVz+2IWEB6MabGELktMG0tp4/KuNhOmpBtn9HpvD4fjq1BA4HoxqYO4HyX0ryQJjkNzB8HQwRvYjTB6EYfL0VoPs/sM48GBUA3M/iL8OSK9DYyP7cR0OTE81yO7fgIRjagPheDCqgbkfJDcHSIMwSI7BIQWMkf04BwnD5OmtBtn9HKl+cPwtBYEHoxqY+0FyKRqJYAySCwLSIIzsR5h8ClRuINQgu38oYWT3Y2MPNjwazqPhPBrOo+FMKgYAWC7QaA== - -AQAAABAOAAAQDgAAWQAAAA==eNprWlFt3jSKBwzXrETgUTWUq0HG389MgmP9o8vheFQN5WqQ8RoceFQN5WqQsfJxBD67/hkcj6qhXA0ytjkjZAHD35HwqBrK1YziUTyKR/EoHpwYAPRsJ9I= - -AQAAABAOAAAQDgAAUQAAAA==eNrtyqEVgDAQRMEtDkUXFEABoGIpIJSS9oK7bN7DnQDxxbiRtkX4zGo4+TP9sofWj8DJHyedrzj546pRuQZO/pjWa5DugZM/AIBfegBlAKCo - -AQAAABAOAAAQDgAAnQAAAA==eNp7U7E24c0QxHsWbYwGYVzswYZx+WNCLQIPRjXYwhYkN1jDGdn9YSqdiTAceTEiCYYHoxqY+0FyMDZIbrCGM7L71a9jx4NRDcz9ID429mDDyO7/cgeBs3O1k2F4MKqBuR8kB2OD5AZrOCO7/0YTewoMV7Qh8GBUA3M/SA7GBskN1nBGdv9QwtjCdjScR8N5NJxHw3k4hTMAWzo5Ig== - - - - diff --git a/tests/visco_plastic_phases_viscosity_jump/solution/solution-00000.pvtu b/tests/visco_plastic_phases_viscosity_jump/solution/solution-00000.pvtu deleted file mode 100644 index 15e14b918b2..00000000000 --- a/tests/visco_plastic_phases_viscosity_jump/solution/solution-00000.pvtu +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tests/visco_plastic_phases_viscosity_jump/solution/solution-00000.visit b/tests/visco_plastic_phases_viscosity_jump/solution/solution-00000.visit deleted file mode 100644 index d3e11641b9a..00000000000 --- a/tests/visco_plastic_phases_viscosity_jump/solution/solution-00000.visit +++ /dev/null @@ -1,2 +0,0 @@ -!NBLOCKS 1 -solution-00000.0000.vtu