Changeset 27386

Timestamp:

11/14/22 12:29:54 (2 years ago)

Author:

Mathieu Morlighem

Message:

CHG: adding inversion stop flag

Location:

issm/trunk-jpl/src/c

Files:

• cores/controladm1qn3_core.cpp (modified) (1 diff)
• cores/controlm1qn3_core.cpp (modified) (1 diff)
• shared/Enum/Enum.vim (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/Enumjl.vim (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (12 diffs)

issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp

@@ -688 +688 @@
                 femmodel->OutputControlsx(&femmodel->results);
         }
+        femmodel->results->AddResult(new GenericExternalResult<int>(femmodel->results->Size()+1,StressbalanceConvergenceNumStepsEnum,max_nonlinear_iterations));
 
         xDelete(aG);

issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp

@@ -179 +179 @@
         femmodel->OutputControlsx(&femmodel->results);
         femmodel->results->AddObject(new GenericExternalResult<double*>(femmodel->results->Size()+1,JEnum,mystruct.Jlist,(*mystruct.i),mystruct.N,0,0));
+        femmodel->results->AddObject(new GenericExternalResult<int>(femmodel->results->Size()+1,InversionStopFlagEnum,int(omode)));
 
         /*Finalize*/

issm/trunk-jpl/src/c/shared/Enum/Enum.vim

@@ -312 +312 @@
 syn keyword cConstant InversionNumCostFunctionsEnum
 syn keyword cConstant InversionStepThresholdEnum
+syn keyword cConstant InversionStopFlagEnum
 syn keyword cConstant InversionTypeEnum
 syn keyword cConstant IvinsEnum

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

@@ -306 +306 @@
         InversionNumCostFunctionsEnum,
         InversionStepThresholdEnum,
+        InversionStopFlagEnum,
         InversionTypeEnum,
         IvinsEnum,

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

@@ -314 +314 @@
                 case InversionNumCostFunctionsEnum : return "InversionNumCostFunctions";
                 case InversionStepThresholdEnum : return "InversionStepThreshold";
+                case InversionStopFlagEnum : return "InversionStopFlag";
                 case InversionTypeEnum : return "InversionType";
                 case IvinsEnum : return "Ivins";

issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim

@@ -305 +305 @@
 syn keyword juliaConstC InversionNumCostFunctionsEnum
 syn keyword juliaConstC InversionStepThresholdEnum
+syn keyword juliaConstC InversionStopFlagEnum
 syn keyword juliaConstC InversionTypeEnum
 syn keyword juliaConstC IvinsEnum

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

@@ -320 +320 @@
               else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum;
               else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum;
+              else if (strcmp(name,"InversionStopFlag")==0) return InversionStopFlagEnum;
               else if (strcmp(name,"InversionType")==0) return InversionTypeEnum;
               else if (strcmp(name,"Ivins")==0) return IvinsEnum;
@@ -382 +383 @@
               else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
               else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
-              else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum;
+              if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
+              else if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum;
               else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
               else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
@@ -505 +506 @@
               else if (strcmp(name,"SolidearthSettingsSelfAttraction")==0) return SolidearthSettingsSelfAttractionEnum;
               else if (strcmp(name,"SolidearthSettingsRotation")==0) return SolidearthSettingsRotationEnum;
-              else if (strcmp(name,"SolidearthSettingsMaxSHCoeff")==0) return SolidearthSettingsMaxSHCoeffEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
+              if (strcmp(name,"SolidearthSettingsMaxSHCoeff")==0) return SolidearthSettingsMaxSHCoeffEnum;
+              else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
               else if (strcmp(name,"SettingsNumResultsOnNodes")==0) return SettingsNumResultsOnNodesEnum;
               else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
@@ -628 +629 @@
               else if (strcmp(name,"TimesteppingInterpForcing")==0) return TimesteppingInterpForcingEnum;
               else if (strcmp(name,"TimesteppingCycleForcing")==0) return TimesteppingCycleForcingEnum;
-              else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
+              if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
+              else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
               else if (strcmp(name,"TimesteppingTimeStepMax")==0) return TimesteppingTimeStepMaxEnum;
               else if (strcmp(name,"TimesteppingTimeStepMin")==0) return TimesteppingTimeStepMinEnum;
@@ -751 +752 @@
               else if (strcmp(name,"CrevasseDepth")==0) return CrevasseDepthEnum;
               else if (strcmp(name,"DamageD")==0) return DamageDEnum;
-              else if (strcmp(name,"DamageDOld")==0) return DamageDOldEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
+              if (strcmp(name,"DamageDOld")==0) return DamageDOldEnum;
+              else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum;
               else if (strcmp(name,"DamageDbarOld")==0) return DamageDbarOldEnum;
               else if (strcmp(name,"DamageF")==0) return DamageFEnum;
@@ -874 +875 @@
               else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
               else if (strcmp(name,"HydrologyMaskNodeActivation")==0) return HydrologyMaskNodeActivationEnum;
-              else if (strcmp(name,"Ice")==0) return IceEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
+              if (strcmp(name,"Ice")==0) return IceEnum;
+              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
               else if (strcmp(name,"Input")==0) return InputEnum;
               else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
@@ -997 +998 @@
               else if (strcmp(name,"SealevelchangeAzimuthIndexHydro")==0) return SealevelchangeAzimuthIndexHydroEnum;
               else if (strcmp(name,"SealevelchangeViscousRSL")==0) return SealevelchangeViscousRSLEnum;
-              else if (strcmp(name,"SealevelchangeViscousSG")==0) return SealevelchangeViscousSGEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"SealevelchangeViscousU")==0) return SealevelchangeViscousUEnum;
+              if (strcmp(name,"SealevelchangeViscousSG")==0) return SealevelchangeViscousSGEnum;
+              else if (strcmp(name,"SealevelchangeViscousU")==0) return SealevelchangeViscousUEnum;
               else if (strcmp(name,"SealevelchangeViscousN")==0) return SealevelchangeViscousNEnum;
               else if (strcmp(name,"SealevelchangeViscousE")==0) return SealevelchangeViscousEEnum;
@@ -1120 +1121 @@
               else if (strcmp(name,"SmbVz")==0) return SmbVzEnum;
               else if (strcmp(name,"SmbW")==0) return SmbWEnum;
-              else if (strcmp(name,"SmbWAdd")==0) return SmbWAddEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"SmbWini")==0) return SmbWiniEnum;
+              if (strcmp(name,"SmbWAdd")==0) return SmbWAddEnum;
+              else if (strcmp(name,"SmbWini")==0) return SmbWiniEnum;
               else if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum;
               else if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum;
@@ -1243 +1244 @@
               else if (strcmp(name,"Outputdefinition30")==0) return Outputdefinition30Enum;
               else if (strcmp(name,"Outputdefinition31")==0) return Outputdefinition31Enum;
-              else if (strcmp(name,"Outputdefinition32")==0) return Outputdefinition32Enum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"Outputdefinition33")==0) return Outputdefinition33Enum;
+              if (strcmp(name,"Outputdefinition32")==0) return Outputdefinition32Enum;
+              else if (strcmp(name,"Outputdefinition33")==0) return Outputdefinition33Enum;
               else if (strcmp(name,"Outputdefinition34")==0) return Outputdefinition34Enum;
               else if (strcmp(name,"Outputdefinition35")==0) return Outputdefinition35Enum;
@@ -1366 +1367 @@
               else if (strcmp(name,"Cfsurfacesquare")==0) return CfsurfacesquareEnum;
               else if (strcmp(name,"Cflevelsetmisfit")==0) return CflevelsetmisfitEnum;
-              else if (strcmp(name,"Channel")==0) return ChannelEnum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"ChannelArea")==0) return ChannelAreaEnum;
+              if (strcmp(name,"Channel")==0) return ChannelEnum;
+              else if (strcmp(name,"ChannelArea")==0) return ChannelAreaEnum;
               else if (strcmp(name,"ChannelAreaOld")==0) return ChannelAreaOldEnum;
               else if (strcmp(name,"ChannelDischarge")==0) return ChannelDischargeEnum;
@@ -1489 +1490 @@
               else if (strcmp(name,"IntMatExternalResult")==0) return IntMatExternalResultEnum;
               else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
-              else if (strcmp(name,"IntParam")==0) return IntParamEnum;
          else stage=13;
    }
    if(stage==13){
-              if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
+              if (strcmp(name,"IntParam")==0) return IntParamEnum;
+              else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
               else if (strcmp(name,"Inputs")==0) return InputsEnum;
               else if (strcmp(name,"Internal")==0) return InternalEnum;
@@ -1612 +1613 @@
               else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
               else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
-              else if (strcmp(name,"Regionaloutput")==0) return RegionaloutputEnum;
          else stage=14;
    }
    if(stage==14){
-              if (strcmp(name,"Regular")==0) return RegularEnum;
+              if (strcmp(name,"Regionaloutput")==0) return RegionaloutputEnum;
+              else if (strcmp(name,"Regular")==0) return RegularEnum;
               else if (strcmp(name,"RecoveryAnalysis")==0) return RecoveryAnalysisEnum;
               else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;