Changeset 21312

Timestamp:

10/25/16 14:44:10 (8 years ago)

Author:

Eric.Larour

Message:

CHG: introducing spcthickness into sea level rise core.

Location:

issm/branches/trunk-larour-NatGeoScience2016/src/c

Files:

• analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• cores/sealevelrise_core.cpp (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (2 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/c/analyses/SealevelriseAnalysis.cpp

@@ -36 +36 @@
         iomodel->FetchDataToInput(elements,"md.mask.land_levelset",MaskLandLevelsetEnum);
         iomodel->FetchDataToInput(elements,"md.slr.deltathickness",SealevelriseDeltathicknessEnum);
+        iomodel->FetchDataToInput(elements,"md.slr.spcthickness",SealevelriseSpcthicknessEnum);
         iomodel->FetchDataToInput(elements,"md.slr.sealevel",SealevelEnum,0);
 

issm/branches/trunk-larour-NatGeoScience2016/src/c/cores/sealevelrise_core.cpp

@@ -383 +383 @@
         nv=femmodel->vertices->NumberOfVertices();
 
-        GetVectorFromInputsx(&newthickness,femmodel,ThicknessEnum,VertexSIdEnum);
-        GetVectorFromInputsx(&oldthickness,femmodel,ThicknessEnum,VertexSIdEnum,time-dt);
+        GetVectorFromInputsx(&newthickness,femmodel,SealevelriseSpcthicknessEnum,VertexSIdEnum);
+        GetVectorFromInputsx(&oldthickness,femmodel,SealevelriseSpcthicknessEnum,VertexSIdEnum,time-dt);
 
         /*compute deltathickness: */

issm/branches/trunk-larour-NatGeoScience2016/src/c/shared/Enum/EnumDefinitions.h

@@ -767 +767 @@
         SealevelEustaticEnum,
         SealevelriseDeltathicknessEnum,
+        SealevelriseSpcthicknessEnum,
         SealevelriseMaxiterEnum,
         SealevelriseReltolEnum,

issm/branches/trunk-larour-NatGeoScience2016/src/c/shared/Enum/EnumToStringx.cpp

@@ -748 +748 @@
                 case SealevelEustaticEnum : return "SealevelEustatic";
                 case SealevelriseDeltathicknessEnum : return "SealevelriseDeltathickness";
+                case SealevelriseSpcthicknessEnum : return "SealevelriseSpcthickness";
                 case SealevelriseMaxiterEnum : return "SealevelriseMaxiter";
                 case SealevelriseReltolEnum : return "SealevelriseReltol";

issm/branches/trunk-larour-NatGeoScience2016/src/c/shared/Enum/StringToEnumx.cpp

@@ -766 +766 @@
               else if (strcmp(name,"SealevelEustatic")==0) return SealevelEustaticEnum;
               else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
+              else if (strcmp(name,"SealevelriseSpcthickness")==0) return SealevelriseSpcthicknessEnum;
               else if (strcmp(name,"SealevelriseMaxiter")==0) return SealevelriseMaxiterEnum;
               else if (strcmp(name,"SealevelriseReltol")==0) return SealevelriseReltolEnum;
@@ -874 +875 @@
               else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
               else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
-              else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
+              if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
+              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
               else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
               else if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum;