Changeset 25293

Timestamp:

07/20/20 20:55:46 (5 years ago)

Author:

Eric.Larour

Message:

CHG: new SealevelArea output from the geometry module + better output information
for error in GetInput2Value.

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (1 diff)
• classes/Inputs2/Inputs2.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/StringToEnumx.cpp (modified) (6 diffs)
• shared/Exceptions/Exceptions.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -5631 +5631 @@
         }
         this->inputs2->SetDoubleInput(AreaEnum,this->lid,area);
+        this->AddInput2(SealevelAreaEnum,&area,P0Enum);
 
         /*Free allocations:*/

issm/trunk-jpl/src/c/classes/Inputs2/Inputs2.cpp

@@ -542 +542 @@
         /*Create it if necessary*/
         if(this->inputs[id]){
-                if(this->inputs[id]->ObjectEnum()!=DoubleInput2Enum) _error_(EnumToStringx(this->inputs[id]->ObjectEnum())<<" cannot return a int");
+                if(this->inputs[id]->ObjectEnum()!=DoubleInput2Enum) _error_(EnumToStringx(this->inputs[id]->ObjectEnum())<<" cannot return a double!");
         }
         else{

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

@@ -820 +820 @@
 syn keyword cConstant SurfaceAbsVelMisfitEnum
 syn keyword cConstant AreaEnum
+syn keyword cConstant SealevelAreaEnum
 syn keyword cConstant SurfaceAreaEnum
 syn keyword cConstant SurfaceAverageVelMisfitEnum

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

@@ -818 +818 @@
         SurfaceAbsVelMisfitEnum,
         AreaEnum,
+        SealevelAreaEnum,
         SurfaceAreaEnum,
         SurfaceAverageVelMisfitEnum,

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

@@ -822 +822 @@
                 case SurfaceAbsVelMisfitEnum : return "SurfaceAbsVelMisfit";
                 case AreaEnum : return "Area";
+                case SealevelAreaEnum : return "SealevelArea";
                 case SurfaceAreaEnum : return "SurfaceArea";
                 case SurfaceAverageVelMisfitEnum : return "SurfaceAverageVelMisfit";

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

@@ -840 +840 @@
               else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
               else if (strcmp(name,"Area")==0) return AreaEnum;
+              else if (strcmp(name,"SealevelArea")==0) return SealevelAreaEnum;
               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
               else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
@@ -874 +875 @@
               else if (strcmp(name,"VyObs")==0) return VyObsEnum;
               else if (strcmp(name,"Vz")==0) return VzEnum;
-              else if (strcmp(name,"VzFS")==0) return VzFSEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"VzHO")==0) return VzHOEnum;
+              if (strcmp(name,"VzFS")==0) return VzFSEnum;
+              else if (strcmp(name,"VzHO")==0) return VzHOEnum;
               else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
               else if (strcmp(name,"VzSSA")==0) return VzSSAEnum;
@@ -997 +998 @@
               else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum;
               else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum;
-              else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
+              if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
+              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
               else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
               else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
@@ -1120 +1121 @@
               else if (strcmp(name,"Gsl")==0) return GslEnum;
               else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
-              else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"Hook")==0) return HookEnum;
+              if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
+              else if (strcmp(name,"Hook")==0) return HookEnum;
               else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
               else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
@@ -1243 +1244 @@
               else if (strcmp(name,"P0DG")==0) return P0DGEnum;
               else if (strcmp(name,"P1DG")==0) return P1DGEnum;
-              else if (strcmp(name,"P1P1")==0) return P1P1Enum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
+              if (strcmp(name,"P1P1")==0) return P1P1Enum;
+              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
               else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
               else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
@@ -1366 +1367 @@
               else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
               else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
-              else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum;
          else stage=12;
    }
    if(stage==12){
-              if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum;
+              if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum;
+              else if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum;
               else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
               else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;

issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp

@@ -49 +49 @@
         file_line= what_line;
         /*When error messages are not shown properly, uncomment the following line*/
-        //this->Report();
+        this->Report();
 
 }/*}}}*/