Changeset 19286

Timestamp:

04/13/15 10:44:40 (10 years ago)

Author:

Eric.Larour

Message:

CHG: first implementation of the esmf compliant binders for ISSM. Inspired from Bin Zhao's work
at Goddard GMAO. The esmf binders consist of three binders:
InitializeISSM, RunISSM and FinalizeISSm, which mirror the main.cpp structure.

These binders will be linked to the GEOS-5 framework, so they are compiled in the libISSMCore only.

The InitializeISSM is concerned mainly with bypassing the forcings that were initialized in ModelProcessorx
with the forcings coming from the GEOS-5 framework. This is accomplished by plugging IssmDouble inputs (from
the gcm forcings) into each element. SurfaceMassBalancex is then modified to basically ignore the initial
setup (for a standard ISSM run) in favor of the forcing we just plugged in.

RunISSM is concerned (for now) with setting the start and final times according to the specified GEOS-5 dt
interval to be run.

FinalizeISSm deletes the ISSM model, standard procedure.

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/main/esmfbinders.cpp (added)
• c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (5 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -449 +449 @@
 endif
 #}}}
+#Esmf sources  {{{
+if ESMF
+issm_sources += ./main/esmfbinders.cpp
+endif
+#}}}
 
 #Wrapper sources

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

@@ -59 +59 @@
                         if(VerboseSolution())_printf0_("  call smb Melt Components module\n");
                         SmbMeltComponentsx(femmodel);
+                        break;
+                case SMBgcmEnum:
+                        /*Nothing to be done*/
                         break;
                 default:

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -382 +382 @@
         SurfaceforcingsMeltEnum,
         SurfaceforcingsRefreezeEnum,
+        SMBgcmEnum,
         /*TO BE REMOVED*/
         SurfaceforcingsIspddEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -386 +386 @@
                 case SurfaceforcingsMeltEnum : return "SurfaceforcingsMelt";
                 case SurfaceforcingsRefreezeEnum : return "SurfaceforcingsRefreeze";
+                case SMBgcmEnum : return "SMBgcm";
                 case SurfaceforcingsIspddEnum : return "SurfaceforcingsIspdd";
                 case SurfaceforcingsIssmbgradientsEnum : return "SurfaceforcingsIssmbgradients";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -395 +395 @@
               else if (strcmp(name,"SurfaceforcingsMelt")==0) return SurfaceforcingsMeltEnum;
               else if (strcmp(name,"SurfaceforcingsRefreeze")==0) return SurfaceforcingsRefreezeEnum;
+              else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum;
               else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum;
               else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum;
@@ -505 +506 @@
               else if (strcmp(name,"Matdamageice")==0) return MatdamageiceEnum;
               else if (strcmp(name,"Matpar")==0) return MatparEnum;
-              else if (strcmp(name,"Node")==0) return NodeEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
+              if (strcmp(name,"Node")==0) return NodeEnum;
+              else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
               else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum;
               else if (strcmp(name,"Param")==0) return ParamEnum;
@@ -628 +629 @@
               else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
               else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
-              else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
+              if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
+              else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
               else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
               else if (strcmp(name,"StressMaxPrincipal")==0) return StressMaxPrincipalEnum;
@@ -751 +752 @@
               else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
               else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
-              else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
+              if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
+              else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
               else if (strcmp(name,"Outputdefinition67")==0) return Outputdefinition67Enum;
               else if (strcmp(name,"Outputdefinition68")==0) return Outputdefinition68Enum;
@@ -874 +875 @@
               else if (strcmp(name,"Regular")==0) return RegularEnum;
               else if (strcmp(name,"Scaled")==0) return ScaledEnum;
-              else if (strcmp(name,"Separate")==0) return SeparateEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"Sset")==0) return SsetEnum;
+              if (strcmp(name,"Separate")==0) return SeparateEnum;
+              else if (strcmp(name,"Sset")==0) return SsetEnum;
               else if (strcmp(name,"Verbose")==0) return VerboseEnum;
               else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -378 +378 @@
 def SurfaceforcingsMeltEnum(): return StringToEnum("SurfaceforcingsMelt")[0]
 def SurfaceforcingsRefreezeEnum(): return StringToEnum("SurfaceforcingsRefreeze")[0]
+def SMBgcmEnum(): return StringToEnum("SMBgcm")[0]
 def SurfaceforcingsIspddEnum(): return StringToEnum("SurfaceforcingsIspdd")[0]
 def SurfaceforcingsIssmbgradientsEnum(): return StringToEnum("SurfaceforcingsIssmbgradients")[0]