[cig-commits] r1384 - trunk/aspect/source/material_model
dannberg at dealii.org
dannberg at dealii.org
Wed Nov 21 07:10:01 PST 2012
Author: dannberg
Date: 2012-11-21 08:10:01 -0700 (Wed, 21 Nov 2012)
New Revision: 1384
Modified:
trunk/aspect/source/material_model/simple.cc
Log:
Change interpolation of compositional viscosities in the simple material model from arithmetic to geometric
Modified: trunk/aspect/source/material_model/simple.cc
===================================================================
--- trunk/aspect/source/material_model/simple.cc 2012-11-21 14:40:42 UTC (rev 1383)
+++ trunk/aspect/source/material_model/simple.cc 2012-11-21 15:10:01 UTC (rev 1384)
@@ -48,10 +48,9 @@
double composition_dependence = 1.0;
if ((composition_viscosity_prefactor != 1.0) && (composition.size() > 0))
{
- // TODO: Currently using an arithmetic interpolation. Usually a geometric interpolation
- // is assumed more realistic for viscosity
- composition_dependence *= (1-composition[0]);
- composition_dependence += composition_viscosity_prefactor * composition[0];
+ //geometric interpolation
+ return (pow(10, ((1-composition[0]) * log10(eta*temperature_dependence)
+ + composition[0] * log10(eta*composition_viscosity_prefactor*temperature_dependence))));
}
return composition_dependence * temperature_dependence * eta;
@@ -130,7 +129,7 @@
{
return (reference_rho * (1 - thermal_alpha * (temperature - reference_T))
+
- (this->n_compositional_fields()>0
+ (compositional_fields.size()>0
?
compositional_delta_rho * compositional_fields[0]
:
More information about the CIG-COMMITS
mailing list