Changeset 9391

Timestamp:

08/23/11 13:13:34 (14 years ago)

Author:

Mathieu Morlighem

Message:

moved NumRiftsEnum to NumriftsEnum

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• m/classes/model.m (modified) (1 diff)
• m/enum/NumRiftsEnum.m (deleted)
• m/enum/NumriftsEnum.m (added)
• m/solutions/control_core.m (modified) (1 diff)
• m/solutions/gradient_core.m (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h ¶

@@ -387 +387 @@
         NdtEnum,
         NumOutputEnum,
-        NumRiftsEnum,
+        NumriftsEnum,
         NumberOfElementsEnum,
         NumberOfNodesEnum,

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp ¶

@@ -337 +337 @@
                 case NdtEnum : return "Ndt";
                 case NumOutputEnum : return "NumOutput";
-                case NumRiftsEnum : return "NumRifts";
+                case NumriftsEnum : return "Numrifts";
                 case NumberOfElementsEnum : return "NumberOfElements";
                 case NumberOfNodesEnum : return "NumberOfNodes";

issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp ¶

@@ -21 +21 @@
         /*Fetch parameters: */
         iomodel->constants->FindParam(&prognostic_DG,PrognosticDGEnum);
+        iomodel->constants->FindParam(&numberofedges,NumberOfEdgesEnum);
 
         /*Output*/

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp ¶

@@ -46 +46 @@
         iomodel->constants->FindParam(&isstokes,IsstokesEnum);
         iomodel->constants->FindParam(&ismacayealpattyn,IsmacayealpattynEnum);
-        iomodel->constants->FindParam(&numrifts,NumRiftsEnum);
-        iomodel->constants->FindParam(&numrifts,NumRiftsEnum);
+        iomodel->constants->FindParam(&numrifts,NumriftsEnum);
 
         /*Recover pointer: */

issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp ¶

@@ -54 +54 @@
         iomodel->constants->FindParam(&numberofvertices2d,NumberOfNodes2DEnum);
         iomodel->constants->FindParam(&numlayers,NumlayersEnum);
-        iomodel->constants->FindParam(&numrifts,NumRiftsEnum);
+        iomodel->constants->FindParam(&numrifts,NumriftsEnum);
 
         /*First, check that partitioning has not yet been carryed out. Just check whether my_elements pointers is not already assigned a value: */

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp ¶

@@ -335 +335 @@
         else if (strcmp(name,"Ndt")==0) return NdtEnum;
         else if (strcmp(name,"NumOutput")==0) return NumOutputEnum;
-        else if (strcmp(name,"NumRifts")==0) return NumRiftsEnum;
+        else if (strcmp(name,"Numrifts")==0) return NumriftsEnum;
         else if (strcmp(name,"NumberOfElements")==0) return NumberOfElementsEnum;
         else if (strcmp(name,"NumberOfNodes")==0) return NumberOfNodesEnum;

issm/trunk/src/m/classes/model.m ¶

@@ -230 +230 @@
                  cm_max           = {NaN,true,'DoubleMat',3};
                  cm_jump          = {[],true,'DoubleMat',3};
-                 cm_gradient      = {0,true,'Integer'};
+                 cm_gradient      = {0,true,'Boolean'};
                  epsvel                              = {0,true,'Double'};
                  meanvel                             = {0,true,'Double'};

issm/trunk/src/m/solutions/control_core.m ¶

@@ -7 +7 @@
 
         %recover parameters common to all solutions
-        num_controls=femmodel.parameters.NumControls;
+        num_controls=femmodel.parameters.NumControlType;
         num_responses=femmodel.parameters.NumResponses;
         responses=femmodel.parameters.CmResponses;

issm/trunk/src/m/solutions/gradient_core.m ¶

@@ -21 +21 @@
 
         %recover parameters common to all solutions
-        num_controls=femmodel.parameters.NumControls;
+        num_controls=femmodel.parameters.NumControlType;
         control_type=femmodel.parameters.ControlType;
         control_steady=femmodel.parameters.ControlSteady;