Changeset 14364

Timestamp:

02/21/13 15:18:49 (12 years ago)

Author:

seroussi

Message:

CHG: output gllevelset

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/classes/objects/Elements/Tria.cpp (modified) (2 diffs)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)
• c/solutions/transient_core.cpp (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/GLlevelsetEnum.m (added)
• m/enum/GroundedPortionEnum.m (added)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)

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

@@ -490 +490 @@
         SoftMigrationEnum,
         SubelementMigrationEnum,
+        GroundedPortionEnum,
         GLlevelsetEnum,
         /*}}}*/

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

@@ -1129 +1129 @@
         
         /*Check that not all nodes are grounded or floating*/
-        if(gl[0]>0 && gl[1]>0 && gl[2]>0){
+        if(gl[0]>0 && gl[1]>0 && gl[2]>0){ // All grounded
                 phi=1;
         }
-        else if(gl[0]<0 && gl[1]<0 && gl[2]<0){
-                _error_("Error. Three nodes of the element are floating, should not compute the fraction of grounded element");
+        else if(gl[0]<0 && gl[1]<0 && gl[2]<0){ //All floating
+                phi=0;
         }
         else{
@@ -1209 +1209 @@
 
         if(phi>1 || phi<0) _error_("Error. Problem with portion of grounded element: value should be between 0 and 1");
+   //this->inputs->AddInput(new DoubleInput(GroundedPortionEnum,phi));
 
         return phi;

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

@@ -471 +471 @@
                 case SoftMigrationEnum : return "SoftMigration";
                 case SubelementMigrationEnum : return "SubelementMigration";
+                case GroundedPortionEnum : return "GroundedPortion";
                 case GLlevelsetEnum : return "GLlevelset";
                 case StokesSolverEnum : return "StokesSolver";

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

@@ -481 +481 @@
               else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
               else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum;
+              else if (strcmp(name,"GroundedPortion")==0) return GroundedPortionEnum;
               else if (strcmp(name,"GLlevelset")==0) return GLlevelsetEnum;
               else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum;
@@ -506 +507 @@
               else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
               else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
-              else if (strcmp(name,"Regular")==0) return RegularEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Scaled")==0) return ScaledEnum;
+              if (strcmp(name,"Regular")==0) return RegularEnum;
+              else if (strcmp(name,"Scaled")==0) return ScaledEnum;
               else if (strcmp(name,"Separate")==0) return SeparateEnum;
               else if (strcmp(name,"Sset")==0) return SsetEnum;

issm/trunk-jpl/src/c/solutions/transient_core.cpp

@@ -143 +143 @@
 
                         if(isdelta18o){
-                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsMonthlytemperaturesEnum);
-                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsPrecipitationEnum);
+                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsMonthlytemperaturesEnum);
+                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsPrecipitationEnum);
+                        }
+                        if(isgroundingline && groundingline_migration==SubelementMigrationEnum){
+                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GLlevelsetEnum);
+                                //InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GroundedPortionEnum);
                         }
 

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

@@ -4549 +4549 @@
         return StringToEnum('SubelementMigration')[0]
 
+def GroundedPortionEnum():
+        """
+        GROUNDEDPORTIONENUM - Enum of GroundedPortion
+
+           Usage:
+              macro=GroundedPortionEnum()
+        """
+
+        return StringToEnum('GroundedPortion')[0]
+
 def GLlevelsetEnum():
         """
@@ -4997 +5007 @@
         """
 
-        return 498
-
+        return 499
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=498;
+macro=499;