Changeset 14900

Timestamp:

05/04/13 23:04:19 (12 years ago)

Author:

adhikari

Message:

CHG: element and materials updated for varying mantle visocity

Location:

issm/trunk-jpl/src/c/classes/objects

Files:

• Elements/Tria.cpp (modified) (3 diffs)
• Materials/Matpar.cpp (modified) (2 diffs)
• Materials/Matpar.h (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -3097 +3097 @@
         IssmDouble lithosphere_density;
         IssmDouble mantle_shear_modulus;
+        IssmDouble mantle_density;
+        Input* mantle_viscosity_input=NULL;
         IssmDouble mantle_viscosity;
-        IssmDouble mantle_density;
         Input* lithosphere_thickness_input=NULL;
         IssmDouble lithosphere_thickness;
@@ -3130 +3131 @@
         lithosphere_density=matpar->GetLithosphereDensity();
         mantle_shear_modulus=matpar->GetMantleShearModulus();
-        mantle_viscosity=matpar->GetMantleViscosity();
         mantle_density=matpar->GetMantleDensity();
         rho_ice=matpar->GetRhoIce();
@@ -3138 +3138 @@
         if (!thickness_input)_error_("thickness input needed to compute gia deflection!");
         thickness_input->GetInputUpToCurrentTimeAverages(&hes,&times,&numtimes,currenttime);
+
+        /*recover mantle viscosity: */
+        mantle_viscosity_input=inputs->GetInput(GiaMantleViscosityEnum);
+        if (!mantle_viscosity_input)_error_("mantle viscosity input needed to compute gia deflection!");
+        mantle_viscosity_input->GetInputAverage(&mantle_viscosity);
 
         /*recover lithosphere thickness: */

issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp

@@ -81 +81 @@
         iomodel->Constant(&this->lithosphere_density,MaterialsLithosphereDensityEnum);
         iomodel->Constant(&this->mantle_shear_modulus,MaterialsMantleShearModulusEnum);
-        iomodel->Constant(&this->mantle_viscosity,MaterialsMantleViscosityEnum);
         iomodel->Constant(&this->mantle_density,MaterialsMantleDensityEnum);
 
@@ -458 +457 @@
 }                
 /*}}}*/ 
-/*FUNCTION Matpar::GetMantleViscosity {{{*/                      
-IssmDouble Matpar::GetMantleViscosity(){                 
-        return mantle_viscosity;                         
-}                
-/*}}}*/ 
 /*FUNCTION Matpar::UnitConversion {{{*/                  
 void Matpar::UnitConversion(void){               

issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h

@@ -55 +55 @@
                 IssmDouble lithosphere_density;
                 IssmDouble mantle_shear_modulus;
-                IssmDouble mantle_viscosity;
                 IssmDouble mantle_density;
 
@@ -131 +130 @@
                 IssmDouble GetLithosphereDensity();
                 IssmDouble GetMantleShearModulus();
-                IssmDouble GetMantleViscosity();
                 IssmDouble GetMantleDensity();
                 void   EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure);