Changeset 21220

Timestamp:

09/22/16 15:50:00 (9 years ago)

Author:

langchar

Message:

BUG: debugging GEMB (time steps, energy balance, restart option, mergins cells)

Location:

issm/trunk-jpl

Files:

• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (7 diffs)
• test/Archives/Archive243.arch (modified) ( previous)
• test/NightlyRun/test243.m (modified) (2 diffs)

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

@@ -172 +172 @@
                 case HydrologysommersEnum : return "Hydrologysommers";
                 case HydrologyHeadEnum : return "HydrologyHead";
+                case HydrologyHeadOldEnum : return "HydrologyHeadOld";
                 case HydrologyGapHeightEnum : return "HydrologyGapHeight";
                 case HydrologyBumpSpacingEnum : return "HydrologyBumpSpacing";

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

@@ -175 +175 @@
               else if (strcmp(name,"Hydrologysommers")==0) return HydrologysommersEnum;
               else if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum;
+              else if (strcmp(name,"HydrologyHeadOld")==0) return HydrologyHeadOldEnum;
               else if (strcmp(name,"HydrologyGapHeight")==0) return HydrologyGapHeightEnum;
               else if (strcmp(name,"HydrologyBumpSpacing")==0) return HydrologyBumpSpacingEnum;
@@ -259 +260 @@
               else if (strcmp(name,"CalvinglevermannMeltingrate")==0) return CalvinglevermannMeltingrateEnum;
               else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
-              else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
+              if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
+              else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
               else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
               else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
@@ -382 +383 @@
               else if (strcmp(name,"SmbSizerst")==0) return SmbSizerstEnum;
               else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum;
-              else if (strcmp(name,"SmbMassBalance")==0) return SmbMassBalanceEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SMBgemb")==0) return SMBgembEnum;
+              if (strcmp(name,"SmbMassBalance")==0) return SmbMassBalanceEnum;
+              else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum;
               else if (strcmp(name,"SmbInitDensityScaling")==0) return SmbInitDensityScalingEnum;
               else if (strcmp(name,"SmbTa")==0) return SmbTaEnum;
@@ -505 +506 @@
               else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
               else if (strcmp(name,"Vx")==0) return VxEnum;
-              else if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
+              if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
+              else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
               else if (strcmp(name,"Vy")==0) return VyEnum;
               else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
@@ -628 +629 @@
               else if (strcmp(name,"Outputdefinition46")==0) return Outputdefinition46Enum;
               else if (strcmp(name,"Outputdefinition47")==0) return Outputdefinition47Enum;
-              else if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum;
+              if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum;
+              else if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum;
               else if (strcmp(name,"Outputdefinition50")==0) return Outputdefinition50Enum;
               else if (strcmp(name,"Outputdefinition51")==0) return Outputdefinition51Enum;
@@ -751 +752 @@
               else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
               else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
-              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
+              if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
+              else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
               else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
               else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
@@ -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;

issm/trunk-jpl/test/NightlyRun/test243.m ¶

@@ -36 +36 @@
 %time stepping: 
 md.timestepping.start_time=1965;
-md.timestepping.final_time=1968;
+md.timestepping.final_time=1966;
 md.timestepping.time_step=1/365.0;
 md.timestepping.interp_forcings=0;
@@ -45 +45 @@
 %Fields and tolerances to track changes
 field_names      ={'SmbDz','SmbT' ,'SmbD' ,'SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance'};
-field_tolerances ={1e-7,5e-5,1e-4,5e-5,1e-5,5e-5,1e-5,1e-7,1e-7};
+field_tolerances ={1e-5,5e-5,1e-4,5e-5,1e-5,5e-5,1e-5,1e-7,1e-7};
 
 field_values={...
-        (md.results.TransientSolution(end).SmbDz(1,:)),...
-        (md.results.TransientSolution(end).SmbT(1,:)),...
-        (md.results.TransientSolution(end).SmbD(1,:)),...
-        (md.results.TransientSolution(end).SmbRe(1,:)),...
-        (md.results.TransientSolution(end).SmbGdn(1,:)),...
-        (md.results.TransientSolution(end).SmbGsp(1,:)),...
-        (md.results.TransientSolution(end).SmbA(1,:)),...
+        (md.results.TransientSolution(end).SmbDz(1,1:240)),...
+        (md.results.TransientSolution(end).SmbT(1,1:240)),...
+        (md.results.TransientSolution(end).SmbD(1,1:240)),...
+        (md.results.TransientSolution(end).SmbRe(1,1:240)),...
+        (md.results.TransientSolution(end).SmbGdn(1,1:240)),...
+        (md.results.TransientSolution(end).SmbGsp(1,1:240)),...
+        (md.results.TransientSolution(end).SmbA(1,1:240)),...
         (md.results.TransientSolution(end).SmbEC(1)),...
         (md.results.TransientSolution(end).SmbMassBalance(1)),...