From f76ed5aee501bc325a6beb9609564e5c58b3741b Mon Sep 17 00:00:00 2001 From: Bob Myhill Date: Wed, 31 Jul 2024 16:45:57 +0100 Subject: [PATCH] update test results --- tests/composite_viscous_outputs.cc | 6 ++--- tests/composite_viscous_outputs/screen-output | 24 +++++++++---------- tests/composite_viscous_outputs_isostress.cc | 2 +- tests/composite_viscous_outputs_no_peierls.cc | 6 ++--- .../screen-output | 24 +++++++++---------- tests/composite_viscous_outputs_phases.cc | 3 ++- 6 files changed, 33 insertions(+), 32 deletions(-) diff --git a/tests/composite_viscous_outputs.cc b/tests/composite_viscous_outputs.cc index 6f8f65301af..8fc7cae9dd3 100644 --- a/tests/composite_viscous_outputs.cc +++ b/tests/composite_viscous_outputs.cc @@ -107,7 +107,7 @@ void f(const aspect::SimulatorAccess &simulator_access, strain_rate[2][1] = 0.; strain_rate[2][2] = 0.; - std::cout << "temperature (K) eta (Pas) creep stress (Pa) edot_ii (/s) edot_ii fractions (diff, disl, prls, drpr, max)" << std::endl; + std::cout << "temperature (K) eta (Pas) creep stress (Pa) edot_ii (/s) edot_ii fractions (diff, disl, prls, drpr, kel, max)" << std::endl; // Loop through strain rates, tracking whether there is a discrepancy in // the decomposed strain rates. @@ -120,7 +120,7 @@ void f(const aspect::SimulatorAccess &simulator_access, double disl_stress; double prls_stress; double drpr_stress; - std::vector partial_strain_rates(5, 0.); + std::vector partial_strain_rates(6, 0.); for (unsigned int i=0; i <= 10; i++) { @@ -134,7 +134,7 @@ void f(const aspect::SimulatorAccess &simulator_access, // of the max viscosity dashpot from the total strain rate // The creep stress is then calculated by subtracting the stress running // through the strain rate limiter from the total stress - creep_strain_rate = total_strain_rate - partial_strain_rates[4]; + creep_strain_rate = total_strain_rate - partial_strain_rates[4] - partial_strain_rates[5]; creep_stress = 2.*(viscosity*total_strain_rate - lim_visc*creep_strain_rate); // Print the output diff --git a/tests/composite_viscous_outputs/screen-output b/tests/composite_viscous_outputs/screen-output index 77b2499d232..25b78b8b328 100644 --- a/tests/composite_viscous_outputs/screen-output +++ b/tests/composite_viscous_outputs/screen-output @@ -2,18 +2,18 @@ Loading shared library <./libcomposite_viscous_outputs.debug.so> * Connecting signals -temperature (K) eta (Pas) creep stress (Pa) edot_ii (/s) edot_ii fractions (diff, disl, prls, drpr, max) -1000 3.45602e+19 6.89205e+08 1e-11 1.29846e-06 0.00363514 0.0654305 0.930933 3.45602e-09 -1100 2.98863e+19 5.95725e+08 1e-11 7.23285e-05 0.835897 0.163395 0.0006365 2.98863e-09 -1200 7.70568e+18 1.52114e+08 1e-11 0.000594407 0.999399 6.44893e-06 1.44515e-33 7.70568e-10 -1300 2.39282e+18 4.58564e+07 1e-11 0.00338081 0.996619 3.19443e-09 1.32277e-59 2.39282e-10 -1400 9.18168e+17 1.63634e+07 1e-11 0.0149609 0.985039 1.26589e-11 5.56077e-82 9.18169e-11 -1500 4.32083e+17 6.64167e+06 1e-11 0.0538305 0.94617 2.09885e-13 1.4634e-101 4.32084e-11 -1600 2.47246e+17 2.94493e+06 1e-11 0.161077 0.838923 8.74429e-15 3.2006e-119 2.47246e-11 -1700 1.67379e+17 1.34758e+06 1e-11 0.397345 0.602655 5.42942e-16 3.38184e-136 1.67378e-11 -1800 1.28447e+17 568948 1e-11 0.749975 0.250025 2.2682e-17 6.38432e-155 1.28447e-11 -1900 1.09563e+17 191256 1e-11 0.962698 0.0373021 2.59166e-19 1.35594e-178 1.09563e-11 -2000 1.02964e+17 59280.1 1e-11 0.99654 0.00345962 2.26225e-21 4.97674e-204 1.02965e-11 +temperature (K) eta (Pas) creep stress (Pa) edot_ii (/s) edot_ii fractions (diff, disl, prls, drpr, kel, max) +1000 3.45602e+19 6.89205e+08 1e-11 1.29846e-06 0.00363514 0.0654305 0.930933 0 3.45602e-09 +1100 2.98863e+19 5.95725e+08 1e-11 7.23285e-05 0.835897 0.163395 0.0006365 0 2.98863e-09 +1200 7.70568e+18 1.52114e+08 1e-11 0.000594407 0.999399 6.44893e-06 1.44515e-33 0 7.70568e-10 +1300 2.39282e+18 4.58564e+07 1e-11 0.00338081 0.996619 3.19443e-09 1.32277e-59 0 2.39282e-10 +1400 9.18168e+17 1.63634e+07 1e-11 0.0149609 0.985039 1.26589e-11 5.56077e-82 0 9.18169e-11 +1500 4.32083e+17 6.64167e+06 1e-11 0.0538305 0.94617 2.09885e-13 1.4634e-101 0 4.32084e-11 +1600 2.47246e+17 2.94493e+06 1e-11 0.161077 0.838923 8.74429e-15 3.2006e-119 0 2.47246e-11 +1700 1.67379e+17 1.34758e+06 1e-11 0.397345 0.602655 5.42942e-16 3.38184e-136 0 1.67378e-11 +1800 1.28447e+17 568948 1e-11 0.749975 0.250025 2.2682e-17 6.38432e-155 0 1.28447e-11 +1900 1.09563e+17 191256 1e-11 0.962698 0.0373021 2.59166e-19 1.35594e-178 0 1.09563e-11 +2000 1.02964e+17 59280.1 1e-11 0.99654 0.00345962 2.26225e-21 4.97674e-204 0 1.02965e-11 OK Number of active cells: 100 (on 1 levels) Number of degrees of freedom: 5,534 (3,969+242+1,323) diff --git a/tests/composite_viscous_outputs_isostress.cc b/tests/composite_viscous_outputs_isostress.cc index a8073a5e2c7..608280d62f5 100644 --- a/tests/composite_viscous_outputs_isostress.cc +++ b/tests/composite_viscous_outputs_isostress.cc @@ -136,7 +136,7 @@ void f(const aspect::SimulatorAccess &simulator_access, // of the max viscosity dashpot from the total strain rate // The creep stress is then calculated by subtracting the stress running // through the strain rate limiter from the total stress - creep_strain_rate = total_strain_rate - partial_strain_rates[5]; + creep_strain_rate = total_strain_rate - partial_strain_rates[4] - partial_strain_rates[5]; creep_stress = 2.*(viscosity*total_strain_rate - lim_visc*creep_strain_rate); // Print the output diff --git a/tests/composite_viscous_outputs_no_peierls.cc b/tests/composite_viscous_outputs_no_peierls.cc index e9bc6b0a158..5c139f5c610 100644 --- a/tests/composite_viscous_outputs_no_peierls.cc +++ b/tests/composite_viscous_outputs_no_peierls.cc @@ -101,7 +101,7 @@ void f(const aspect::SimulatorAccess &simulator_access, strain_rate[2][1] = 0.; strain_rate[2][2] = 0.; - std::cout << "temperature (K) eta (Pas) creep stress (Pa) edot_ii (/s) edot_ii fractions (diff, disl, prls, drpr, max)" << std::endl; + std::cout << "temperature (K) eta (Pas) creep stress (Pa) edot_ii (/s) edot_ii fractions (diff, disl, prls, drpr, kel, max)" << std::endl; // Loop through strain rates, tracking whether there is a discrepancy in // the decomposed strain rates. @@ -113,7 +113,7 @@ void f(const aspect::SimulatorAccess &simulator_access, double diff_stress; double disl_stress; double drpr_stress; - std::vector partial_strain_rates(5, 0.); + std::vector partial_strain_rates(6, 0.); for (unsigned int i=0; i <= 10; i++) { @@ -127,7 +127,7 @@ void f(const aspect::SimulatorAccess &simulator_access, // of the max viscosity dashpot from the total strain rate // The creep stress is then calculated by subtracting the stress running // through the strain rate limiter from the total stress - creep_strain_rate = total_strain_rate - partial_strain_rates[4]; + creep_strain_rate = total_strain_rate - partial_strain_rates[4] - partial_strain_rates[5]; creep_stress = 2.*(viscosity*total_strain_rate - lim_visc*creep_strain_rate); // Print the output diff --git a/tests/composite_viscous_outputs_no_peierls/screen-output b/tests/composite_viscous_outputs_no_peierls/screen-output index e1c4155b475..ab3c2caa4bb 100644 --- a/tests/composite_viscous_outputs_no_peierls/screen-output +++ b/tests/composite_viscous_outputs_no_peierls/screen-output @@ -2,18 +2,18 @@ Loading shared library <./libcomposite_viscous_outputs_no_peierls.debug.so> * Connecting signals -temperature (K) eta (Pas) creep stress (Pa) edot_ii (/s) edot_ii fractions (diff, disl, prls, drpr, max) -1000 3.46071e+19 6.90142e+08 1e-11 1.30023e-06 0.00365246 0 0.996346 3.46071e-09 -1100 3.13843e+19 6.25686e+08 1e-11 7.59662e-05 0.992522 0 0.00740179 3.13843e-09 -1200 7.7057e+18 1.52114e+08 1e-11 0.000594408 0.999406 0 1.44528e-33 7.7057e-10 -1300 2.39282e+18 4.58564e+07 1e-11 0.00338081 0.996619 0 1.32277e-59 2.39282e-10 -1400 9.18168e+17 1.63634e+07 1e-11 0.0149609 0.985039 0 5.56077e-82 9.18169e-11 -1500 4.32083e+17 6.64167e+06 1e-11 0.0538305 0.94617 0 1.4634e-101 4.32084e-11 -1600 2.47246e+17 2.94493e+06 1e-11 0.161077 0.838923 0 3.2006e-119 2.47246e-11 -1700 1.67379e+17 1.34758e+06 1e-11 0.397345 0.602655 0 3.38184e-136 1.67378e-11 -1800 1.28447e+17 568948 1e-11 0.749975 0.250025 0 6.38432e-155 1.28447e-11 -1900 1.09563e+17 191256 1e-11 0.962698 0.0373021 0 1.35594e-178 1.09563e-11 -2000 1.02964e+17 59280.1 1e-11 0.99654 0.00345962 0 4.97674e-204 1.02965e-11 +temperature (K) eta (Pas) creep stress (Pa) edot_ii (/s) edot_ii fractions (diff, disl, prls, drpr, kel, max) +1000 3.46071e+19 6.90142e+08 1e-11 1.30023e-06 0.00365246 0 0.996346 0 3.46071e-09 +1100 3.13843e+19 6.25686e+08 1e-11 7.59662e-05 0.992522 0 0.00740179 0 3.13843e-09 +1200 7.7057e+18 1.52114e+08 1e-11 0.000594408 0.999406 0 1.44528e-33 0 7.7057e-10 +1300 2.39282e+18 4.58564e+07 1e-11 0.00338081 0.996619 0 1.32277e-59 0 2.39282e-10 +1400 9.18168e+17 1.63634e+07 1e-11 0.0149609 0.985039 0 5.56077e-82 0 9.18169e-11 +1500 4.32083e+17 6.64167e+06 1e-11 0.0538305 0.94617 0 1.4634e-101 0 4.32084e-11 +1600 2.47246e+17 2.94493e+06 1e-11 0.161077 0.838923 0 3.2006e-119 0 2.47246e-11 +1700 1.67379e+17 1.34758e+06 1e-11 0.397345 0.602655 0 3.38184e-136 0 1.67378e-11 +1800 1.28447e+17 568948 1e-11 0.749975 0.250025 0 6.38432e-155 0 1.28447e-11 +1900 1.09563e+17 191256 1e-11 0.962698 0.0373021 0 1.35594e-178 0 1.09563e-11 +2000 1.02964e+17 59280.1 1e-11 0.99654 0.00345962 0 4.97674e-204 0 1.02965e-11 OK Number of active cells: 100 (on 1 levels) Number of degrees of freedom: 5,534 (3,969+242+1,323) diff --git a/tests/composite_viscous_outputs_phases.cc b/tests/composite_viscous_outputs_phases.cc index 3650747cfab..a9bb3025948 100644 --- a/tests/composite_viscous_outputs_phases.cc +++ b/tests/composite_viscous_outputs_phases.cc @@ -125,6 +125,7 @@ void f(const aspect::SimulatorAccess &simulator_access, double temperature; double pressure; const double grain_size = 1.e-3; + const double inverse_kelvin_viscosity = 0.; SymmetricTensor<2,dim> strain_rate; strain_rate[0][0] = -1e-11; strain_rate[0][1] = 0.; @@ -176,7 +177,7 @@ void f(const aspect::SimulatorAccess &simulator_access, Rheology::DruckerPragerParameters p = drucker_prager_power->compute_drucker_prager_parameters(composition, phase_function_values, n_phase_transitions_per_composition); // Compute the viscosity - viscosity = composite_creep->compute_viscosity(pressure, temperature, grain_size, volume_fractions, strain_rate, partial_strain_rates, phase_function_values, n_phase_transitions_per_composition); + viscosity = composite_creep->compute_viscosity(pressure, temperature, grain_size, volume_fractions, strain_rate, inverse_kelvin_viscosity, partial_strain_rates, phase_function_values, n_phase_transitions_per_composition); total_strain_rate = std::accumulate(partial_strain_rates.begin(), partial_strain_rates.end(), 0.); // The creep strain rate is calculated by subtracting the strain rate