Changeset 14899

Timestamp:

05/04/13 22:59:30 (12 years ago)

Author:

adhikari

Message:

CHG: relevant update associated with GiaMantleViscosityEnum that account for varying mantle viscosity in gia model

Location:

issm/trunk-jpl/src/c/modules

Files:

• EnumToStringx/EnumToStringx.cpp (modified) (2 diffs)
• ModelProcessorx/Gia/UpdateElementsGia.cpp (modified) (2 diffs)
• StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -163 +163 @@
                 case MaterialsLithosphereDensityEnum : return "MaterialsLithosphereDensity";
                 case MaterialsMantleShearModulusEnum : return "MaterialsMantleShearModulus";
-                case MaterialsMantleViscosityEnum : return "MaterialsMantleViscosity";
                 case MaterialsMantleDensityEnum : return "MaterialsMantleDensity";
                 case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity";
@@ -245 +244 @@
                 case ThermalStabilizationEnum : return "ThermalStabilization";
                 case ThermalIsenthalpyEnum : return "ThermalIsenthalpy";
+                case GiaMantleViscosityEnum : return "GiaMantleViscosity";
                 case GiaLithosphereThicknessEnum : return "GiaLithosphereThickness";
                 case ThicknessEnum : return "Thickness";

issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp

@@ -18 +18 @@
         int    numberofelements;
 
-        /*Fetch data needed: */
+        /*Fetch parameters: */
         iomodel->Constant(&dim,MeshDimensionEnum);
         iomodel->Constant(&numberofelements,MeshNumberofelementsEnum);
-        iomodel->FetchData(2,MeshElementsEnum,GiaLithosphereThicknessEnum);
+
+        /*Fetch data needed: */
+        iomodel->FetchData(1,MeshElementsEnum);
 
         /*Update elements: */
@@ -34 +36 @@
 
         iomodel->FetchDataToInput(elements,ThicknessEnum);
+        iomodel->FetchDataToInput(elements,GiaMantleViscosityEnum);
         iomodel->FetchDataToInput(elements,GiaLithosphereThicknessEnum);
 
         /*Free data: */
-        iomodel->DeleteData(2,MeshElementsEnum,GiaLithosphereThicknessEnum);
+        iomodel->DeleteData(1,MeshElementsEnum);
+
 }

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -167 +167 @@
               else if (strcmp(name,"MaterialsLithosphereDensity")==0) return MaterialsLithosphereDensityEnum;
               else if (strcmp(name,"MaterialsMantleShearModulus")==0) return MaterialsMantleShearModulusEnum;
-              else if (strcmp(name,"MaterialsMantleViscosity")==0) return MaterialsMantleViscosityEnum;
               else if (strcmp(name,"MaterialsMantleDensity")==0) return MaterialsMantleDensityEnum;
               else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
@@ -249 +248 @@
               else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
               else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum;
+              else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum;
               else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
               else if (strcmp(name,"Thickness")==0) return ThicknessEnum;