Changeset 6362

Timestamp:

10/21/10 12:28:56 (14 years ago)

Author:

Eric.Larour

Message:

New IoGather and IoSplit enums, for parallel I/O.

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.cpp (modified) (1 diff)
• c/EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
• c/EnumDefinitions/EnumToString.cpp (modified) (2 diffs)
• c/EnumDefinitions/StringToEnum.cpp (modified) (2 diffs)
• m/enum/AbsoluteEnum.m (modified) (1 diff)
• m/enum/AdjointEnum.m (modified) (1 diff)
• m/enum/BetaEnum.m (modified) (1 diff)
• m/enum/CmGradientEnum.m (modified) (1 diff)
• m/enum/CmJumpEnum.m (modified) (1 diff)
• m/enum/CmMaxEnum.m (modified) (1 diff)
• m/enum/CmMinEnum.m (modified) (1 diff)
• m/enum/ColinearEnum.m (modified) (1 diff)
• m/enum/ConnectivityEnum.m (modified) (1 diff)
• m/enum/ControlSteadyEnum.m (modified) (1 diff)
• m/enum/DakotaParameterEnum.m (modified) (1 diff)
• m/enum/DimEnum.m (modified) (1 diff)
• m/enum/EnumToString.m (modified) (2 diffs)
• m/enum/EpsAbsEnum.m (modified) (1 diff)
• m/enum/EpsCmEnum.m (modified) (1 diff)
• m/enum/EpsRelEnum.m (modified) (1 diff)
• m/enum/EpsResEnum.m (modified) (1 diff)
• m/enum/FsetEnum.m (modified) (1 diff)
• m/enum/Gradient1Enum.m (modified) (1 diff)
• m/enum/Gradient2Enum.m (modified) (1 diff)
• m/enum/Gradient3Enum.m (modified) (1 diff)
• m/enum/GradientEnum.m (modified) (1 diff)
• m/enum/GravityEnum.m (modified) (1 diff)
• m/enum/GsetEnum.m (modified) (1 diff)
• m/enum/HeatCapacityEnum.m (modified) (1 diff)
• m/enum/IndexEnum.m (modified) (1 diff)
• m/enum/IndexedEnum.m (modified) (1 diff)
• m/enum/IntersectEnum.m (modified) (1 diff)
• m/enum/IsHutterEnum.m (modified) (1 diff)
• m/enum/IsMacAyealPattynEnum.m (modified) (1 diff)
• m/enum/IsStokesEnum.m (modified) (1 diff)
• m/enum/KffEnum.m (modified) (1 diff)
• m/enum/LatentHeatEnum.m (modified) (1 diff)
• m/enum/LowmemEnum.m (modified) (1 diff)
• m/enum/MaxAbsVxEnum.m (modified) (1 diff)
• m/enum/MaxAbsVyEnum.m (modified) (1 diff)
• m/enum/MaxAbsVzEnum.m (modified) (1 diff)
• m/enum/MaxIterEnum.m (modified) (1 diff)
• m/enum/MaxNonlinearIterationsEnum.m (modified) (1 diff)
• m/enum/MaxVelEnum.m (modified) (1 diff)
• m/enum/MaxVxEnum.m (modified) (1 diff)
• m/enum/MaxVyEnum.m (modified) (1 diff)
• m/enum/MaxVzEnum.m (modified) (1 diff)
• m/enum/MeltingPointEnum.m (modified) (1 diff)
• m/enum/MinMechanicalConstraintsEnum.m (modified) (1 diff)
• m/enum/MinThermalConstraintsEnum.m (modified) (1 diff)
• m/enum/MinVelEnum.m (modified) (1 diff)
• m/enum/MinVxEnum.m (modified) (1 diff)
• m/enum/MinVyEnum.m (modified) (1 diff)
• m/enum/MinVzEnum.m (modified) (1 diff)
• m/enum/MixedLayerCapacityEnum.m (modified) (1 diff)
• m/enum/NStepsEnum.m (modified) (1 diff)
• m/enum/NdtEnum.m (modified) (1 diff)
• m/enum/NodalEnum.m (modified) (1 diff)
• m/enum/NumOutputEnum.m (modified) (1 diff)
• m/enum/NumRiftsEnum.m (modified) (1 diff)
• m/enum/NumberOfElementsEnum.m (modified) (1 diff)
• m/enum/NumberOfNodesEnum.m (modified) (1 diff)
• m/enum/NumberOfVerticesEnum.m (modified) (1 diff)
• m/enum/OldGradientEnum.m (modified) (1 diff)
• m/enum/OptScalEnum.m (modified) (1 diff)
• m/enum/OutputFilePointerEnum.m (modified) (1 diff)
• m/enum/ParameterOutputEnum.m (modified) (1 diff)
• m/enum/PenaltyMeltingEnum.m (modified) (1 diff)
• m/enum/PetscOptionsAnalysesEnum.m (modified) (1 diff)
• m/enum/PetscOptionsStringsEnum.m (modified) (1 diff)
• m/enum/PetscRcEnum.m (modified) (1 diff)
• m/enum/QmuAnalysisEnum.m (modified) (1 diff)
• m/enum/QmuErrNameEnum.m (modified) (1 diff)
• m/enum/QmuInNameEnum.m (modified) (1 diff)
• m/enum/QmuMassFluxSegmentsEnum.m (modified) (1 diff)
• m/enum/QmuNPartEnum.m (modified) (1 diff)
• m/enum/QmuNumberOfResponsesEnum.m (modified) (1 diff)
• m/enum/QmuOutNameEnum.m (modified) (1 diff)
• m/enum/QmuPartEnum.m (modified) (1 diff)
• m/enum/RegularEnum.m (modified) (1 diff)
• m/enum/RelativeEnum.m (modified) (1 diff)
• m/enum/ResidualEnum.m (modified) (1 diff)
• m/enum/ResponseDescriptorsEnum.m (modified) (1 diff)
• m/enum/RhoIceEnum.m (modified) (1 diff)
• m/enum/RhoWaterEnum.m (modified) (1 diff)
• m/enum/ScaledEnum.m (modified) (1 diff)
• m/enum/SeparateEnum.m (modified) (1 diff)
• m/enum/SparsityEnum.m (modified) (1 diff)
• m/enum/SsetEnum.m (modified) (1 diff)
• m/enum/StringToEnum.m (modified) (2 diffs)
• m/enum/ThermalConductivityEnum.m (modified) (1 diff)
• m/enum/ThermalExchangeVelocityEnum.m (modified) (1 diff)
• m/enum/TolXEnum.m (modified) (1 diff)
• m/enum/VariableDescriptorsEnum.m (modified) (1 diff)
• m/enum/VerboseEnum.m (modified) (1 diff)
• m/enum/WaitOnLockEnum.m (modified) (1 diff)
• m/enum/YtsEnum.m (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp

@@ -8 +8 @@
 /*functions on enums: */
 int EnumIsElement(int en){
-        if ((en>=ElementEnum) && (en<=TriaEnum)) return 1;
+        if ((en==TriaEnum) || (en==PentaEnum))return 1;
         else return 0;
 }

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

@@ -284 +284 @@
         OutputFrequencyEnum,
         /*}}}*/
+        /*Io{{{1*/
+        IoGatherEnum,
+        IoSplitEnum,
+        /*}}}*/
         /*Responses{{{1*/
         MinVelEnum,
@@ -354 +358 @@
         OptScalEnum,
         OutputFilePointerEnum,
+        OutputFileNameEnum,
         ParameterOutputEnum,
         PenaltyMeltingEnum,

issm/trunk/src/c/EnumDefinitions/EnumToString.cpp

@@ -253 +253 @@
                 case TimeEnum : return "Time";
                 case OutputFrequencyEnum : return "OutputFrequency";
+                case IoGatherEnum : return "IoGather";
+                case IoSplitEnum : return "IoSplit";
                 case MinVelEnum : return "MinVel";
                 case MaxVelEnum : return "MaxVel";
@@ -316 +318 @@
                 case OptScalEnum : return "OptScal";
                 case OutputFilePointerEnum : return "OutputFilePointer";
+                case OutputFileNameEnum : return "OutputFileName";
                 case ParameterOutputEnum : return "ParameterOutput";
                 case PenaltyMeltingEnum : return "PenaltyMelting";

issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp

@@ -251 +251 @@
         else if (strcmp(name,"Time")==0) return TimeEnum;
         else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum;
+        else if (strcmp(name,"IoGather")==0) return IoGatherEnum;
+        else if (strcmp(name,"IoSplit")==0) return IoSplitEnum;
         else if (strcmp(name,"MinVel")==0) return MinVelEnum;
         else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
@@ -314 +316 @@
         else if (strcmp(name,"OptScal")==0) return OptScalEnum;
         else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
+        else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
         else if (strcmp(name,"ParameterOutput")==0) return ParameterOutputEnum;
         else if (strcmp(name,"PenaltyMelting")==0) return PenaltyMeltingEnum;

issm/trunk/src/m/enum/AbsoluteEnum.m

@@ -9 +9 @@
 %      macro=AbsoluteEnum()
 
-macro=250;
+macro=252;

issm/trunk/src/m/enum/AdjointEnum.m

@@ -9 +9 @@
 %      macro=AdjointEnum()
 
-macro=265;
+macro=267;

issm/trunk/src/m/enum/BetaEnum.m

@@ -9 +9 @@
 %      macro=BetaEnum()
 
-macro=260;
+macro=262;

issm/trunk/src/m/enum/CmGradientEnum.m

@@ -9 +9 @@
 %      macro=CmGradientEnum()
 
-macro=261;
+macro=263;

issm/trunk/src/m/enum/CmJumpEnum.m

@@ -9 +9 @@
 %      macro=CmJumpEnum()
 
-macro=262;
+macro=264;

issm/trunk/src/m/enum/CmMaxEnum.m

@@ -9 +9 @@
 %      macro=CmMaxEnum()
 
-macro=263;
+macro=265;

issm/trunk/src/m/enum/CmMinEnum.m

@@ -9 +9 @@
 %      macro=CmMinEnum()
 
-macro=264;
+macro=266;

issm/trunk/src/m/enum/ColinearEnum.m

@@ -9 +9 @@
 %      macro=ColinearEnum()
 
-macro=258;
+macro=260;

issm/trunk/src/m/enum/ConnectivityEnum.m

@@ -9 +9 @@
 %      macro=ConnectivityEnum()
 
-macro=271;
+macro=273;

issm/trunk/src/m/enum/ControlSteadyEnum.m

@@ -9 +9 @@
 %      macro=ControlSteadyEnum()
 
-macro=272;
+macro=274;

issm/trunk/src/m/enum/DakotaParameterEnum.m

@@ -9 +9 @@
 %      macro=DakotaParameterEnum()
 
-macro=273;
+macro=275;

issm/trunk/src/m/enum/DimEnum.m

@@ -9 +9 @@
 %      macro=DimEnum()
 
-macro=274;
+macro=276;

issm/trunk/src/m/enum/EnumToString.m

@@ -248 +248 @@
 case TimeEnum(), string='Time'; return
 case OutputFrequencyEnum(), string='OutputFrequency'; return
+case IoGatherEnum(), string='IoGather'; return
+case IoSplitEnum(), string='IoSplit'; return
 case MinVelEnum(), string='MinVel'; return
 case MaxVelEnum(), string='MaxVel'; return
@@ -311 +313 @@
 case OptScalEnum(), string='OptScal'; return
 case OutputFilePointerEnum(), string='OutputFilePointer'; return
+case OutputFileNameEnum(), string='OutputFileName'; return
 case ParameterOutputEnum(), string='ParameterOutput'; return
 case PenaltyMeltingEnum(), string='PenaltyMelting'; return

issm/trunk/src/m/enum/EpsAbsEnum.m

@@ -9 +9 @@
 %      macro=EpsAbsEnum()
 
-macro=275;
+macro=277;

issm/trunk/src/m/enum/EpsCmEnum.m

@@ -9 +9 @@
 %      macro=EpsCmEnum()
 
-macro=276;
+macro=278;

issm/trunk/src/m/enum/EpsRelEnum.m

@@ -9 +9 @@
 %      macro=EpsRelEnum()
 
-macro=277;
+macro=279;

issm/trunk/src/m/enum/EpsResEnum.m

@@ -9 +9 @@
 %      macro=EpsResEnum()
 
-macro=278;
+macro=280;

issm/trunk/src/m/enum/FsetEnum.m

@@ -9 +9 @@
 %      macro=FsetEnum()
 
-macro=325;
+macro=328;

issm/trunk/src/m/enum/Gradient1Enum.m

@@ -9 +9 @@
 %      macro=Gradient1Enum()
 
-macro=267;
+macro=269;

issm/trunk/src/m/enum/Gradient2Enum.m

@@ -9 +9 @@
 %      macro=Gradient2Enum()
 
-macro=268;
+macro=270;

issm/trunk/src/m/enum/Gradient3Enum.m

@@ -9 +9 @@
 %      macro=Gradient3Enum()
 
-macro=269;
+macro=271;

issm/trunk/src/m/enum/GradientEnum.m

@@ -9 +9 @@
 %      macro=GradientEnum()
 
-macro=266;
+macro=268;

issm/trunk/src/m/enum/GravityEnum.m

@@ -9 +9 @@
 %      macro=GravityEnum()
 
-macro=253;
+macro=255;

issm/trunk/src/m/enum/GsetEnum.m

@@ -9 +9 @@
 %      macro=GsetEnum()
 
-macro=324;
+macro=327;

issm/trunk/src/m/enum/HeatCapacityEnum.m

@@ -9 +9 @@
 %      macro=HeatCapacityEnum()
 
-macro=279;
+macro=281;

issm/trunk/src/m/enum/IndexEnum.m

@@ -9 +9 @@
 %      macro=IndexEnum()
 
-macro=312;
+macro=315;

issm/trunk/src/m/enum/IndexedEnum.m

@@ -9 +9 @@
 %      macro=IndexedEnum()
 
-macro=310;
+macro=313;

issm/trunk/src/m/enum/IntersectEnum.m

@@ -9 +9 @@
 %      macro=IntersectEnum()
 
-macro=257;
+macro=259;

issm/trunk/src/m/enum/IsHutterEnum.m

@@ -9 +9 @@
 %      macro=IsHutterEnum()
 
-macro=280;
+macro=282;

issm/trunk/src/m/enum/IsMacAyealPattynEnum.m

@@ -9 +9 @@
 %      macro=IsMacAyealPattynEnum()
 
-macro=281;
+macro=283;

issm/trunk/src/m/enum/IsStokesEnum.m

@@ -9 +9 @@
 %      macro=IsStokesEnum()
 
-macro=282;
+macro=284;

issm/trunk/src/m/enum/KffEnum.m

@@ -9 +9 @@
 %      macro=KffEnum()
 
-macro=283;
+macro=285;

issm/trunk/src/m/enum/LatentHeatEnum.m

@@ -9 +9 @@
 %      macro=LatentHeatEnum()
 
-macro=284;
+macro=286;

issm/trunk/src/m/enum/LowmemEnum.m

@@ -9 +9 @@
 %      macro=LowmemEnum()
 
-macro=285;
+macro=287;

issm/trunk/src/m/enum/MaxAbsVxEnum.m

@@ -9 +9 @@
 %      macro=MaxAbsVxEnum()
 
-macro=241;
+macro=243;

issm/trunk/src/m/enum/MaxAbsVyEnum.m

@@ -9 +9 @@
 %      macro=MaxAbsVyEnum()
 
-macro=244;
+macro=246;

issm/trunk/src/m/enum/MaxAbsVzEnum.m

@@ -9 +9 @@
 %      macro=MaxAbsVzEnum()
 
-macro=247;
+macro=249;

issm/trunk/src/m/enum/MaxIterEnum.m

@@ -9 +9 @@
 %      macro=MaxIterEnum()
 
-macro=286;
+macro=288;

issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m

@@ -9 +9 @@
 %      macro=MaxNonlinearIterationsEnum()
 
-macro=287;
+macro=289;

issm/trunk/src/m/enum/MaxVelEnum.m

@@ -9 +9 @@
 %      macro=MaxVelEnum()
 
-macro=238;
+macro=240;

issm/trunk/src/m/enum/MaxVxEnum.m

@@ -9 +9 @@
 %      macro=MaxVxEnum()
 
-macro=240;
+macro=242;

issm/trunk/src/m/enum/MaxVyEnum.m

@@ -9 +9 @@
 %      macro=MaxVyEnum()
 
-macro=243;
+macro=245;

issm/trunk/src/m/enum/MaxVzEnum.m

@@ -9 +9 @@
 %      macro=MaxVzEnum()
 
-macro=246;
+macro=248;

issm/trunk/src/m/enum/MeltingPointEnum.m

@@ -9 +9 @@
 %      macro=MeltingPointEnum()
 
-macro=288;
+macro=290;

issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m

@@ -9 +9 @@
 %      macro=MinMechanicalConstraintsEnum()
 
-macro=289;
+macro=291;

issm/trunk/src/m/enum/MinThermalConstraintsEnum.m

@@ -9 +9 @@
 %      macro=MinThermalConstraintsEnum()
 
-macro=290;
+macro=292;

issm/trunk/src/m/enum/MinVelEnum.m

@@ -9 +9 @@
 %      macro=MinVelEnum()
 
-macro=237;
+macro=239;

issm/trunk/src/m/enum/MinVxEnum.m

@@ -9 +9 @@
 %      macro=MinVxEnum()
 
-macro=239;
+macro=241;

issm/trunk/src/m/enum/MinVyEnum.m

@@ -9 +9 @@
 %      macro=MinVyEnum()
 
-macro=242;
+macro=244;

issm/trunk/src/m/enum/MinVzEnum.m

@@ -9 +9 @@
 %      macro=MinVzEnum()
 
-macro=245;
+macro=247;

issm/trunk/src/m/enum/MixedLayerCapacityEnum.m

@@ -9 +9 @@
 %      macro=MixedLayerCapacityEnum()
 
-macro=255;
+macro=257;

issm/trunk/src/m/enum/NStepsEnum.m

@@ -9 +9 @@
 %      macro=NStepsEnum()
 
-macro=291;
+macro=293;

issm/trunk/src/m/enum/NdtEnum.m

@@ -9 +9 @@
 %      macro=NdtEnum()
 
-macro=292;
+macro=294;

issm/trunk/src/m/enum/NodalEnum.m

@@ -9 +9 @@
 %      macro=NodalEnum()
 
-macro=314;
+macro=317;

issm/trunk/src/m/enum/NumOutputEnum.m

@@ -9 +9 @@
 %      macro=NumOutputEnum()
 
-macro=293;
+macro=295;

issm/trunk/src/m/enum/NumRiftsEnum.m

@@ -9 +9 @@
 %      macro=NumRiftsEnum()
 
-macro=294;
+macro=296;

issm/trunk/src/m/enum/NumberOfElementsEnum.m

@@ -9 +9 @@
 %      macro=NumberOfElementsEnum()
 
-macro=295;
+macro=297;

issm/trunk/src/m/enum/NumberOfNodesEnum.m

@@ -9 +9 @@
 %      macro=NumberOfNodesEnum()
 
-macro=296;
+macro=298;

issm/trunk/src/m/enum/NumberOfVerticesEnum.m

@@ -9 +9 @@
 %      macro=NumberOfVerticesEnum()
 
-macro=297;
+macro=299;

issm/trunk/src/m/enum/OldGradientEnum.m

@@ -9 +9 @@
 %      macro=OldGradientEnum()
 
-macro=270;
+macro=272;

issm/trunk/src/m/enum/OptScalEnum.m

@@ -9 +9 @@
 %      macro=OptScalEnum()
 
-macro=298;
+macro=300;

issm/trunk/src/m/enum/OutputFilePointerEnum.m

@@ -9 +9 @@
 %      macro=OutputFilePointerEnum()
 
-macro=299;
+macro=301;

issm/trunk/src/m/enum/ParameterOutputEnum.m

@@ -9 +9 @@
 %      macro=ParameterOutputEnum()
 
-macro=300;
+macro=303;

issm/trunk/src/m/enum/PenaltyMeltingEnum.m

@@ -9 +9 @@
 %      macro=PenaltyMeltingEnum()
 
-macro=301;
+macro=304;

issm/trunk/src/m/enum/PetscOptionsAnalysesEnum.m

@@ -9 +9 @@
 %      macro=PetscOptionsAnalysesEnum()
 
-macro=323;
+macro=326;

issm/trunk/src/m/enum/PetscOptionsStringsEnum.m

@@ -9 +9 @@
 %      macro=PetscOptionsStringsEnum()
 
-macro=322;
+macro=325;

issm/trunk/src/m/enum/PetscRcEnum.m

@@ -9 +9 @@
 %      macro=PetscRcEnum()
 
-macro=316;
+macro=319;

issm/trunk/src/m/enum/QmuAnalysisEnum.m

@@ -9 +9 @@
 %      macro=QmuAnalysisEnum()
 
-macro=302;
+macro=305;

issm/trunk/src/m/enum/QmuErrNameEnum.m

@@ -9 +9 @@
 %      macro=QmuErrNameEnum()
 
-macro=303;
+macro=306;

issm/trunk/src/m/enum/QmuInNameEnum.m

@@ -9 +9 @@
 %      macro=QmuInNameEnum()
 
-macro=304;
+macro=307;

issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m

@@ -9 +9 @@
 %      macro=QmuMassFluxSegmentsEnum()
 
-macro=305;
+macro=308;

issm/trunk/src/m/enum/QmuNPartEnum.m

@@ -9 +9 @@
 %      macro=QmuNPartEnum()
 
-macro=306;
+macro=309;

issm/trunk/src/m/enum/QmuNumberOfResponsesEnum.m

@@ -9 +9 @@
 %      macro=QmuNumberOfResponsesEnum()
 
-macro=309;
+macro=312;

issm/trunk/src/m/enum/QmuOutNameEnum.m

@@ -9 +9 @@
 %      macro=QmuOutNameEnum()
 
-macro=307;
+macro=310;

issm/trunk/src/m/enum/QmuPartEnum.m

@@ -9 +9 @@
 %      macro=QmuPartEnum()
 
-macro=308;
+macro=311;

issm/trunk/src/m/enum/RegularEnum.m

@@ -9 +9 @@
 %      macro=RegularEnum()
 
-macro=311;
+macro=314;

issm/trunk/src/m/enum/RelativeEnum.m

@@ -9 +9 @@
 %      macro=RelativeEnum()
 
-macro=248;
+macro=250;

issm/trunk/src/m/enum/ResidualEnum.m

@@ -9 +9 @@
 %      macro=ResidualEnum()
 
-macro=249;
+macro=251;

issm/trunk/src/m/enum/ResponseDescriptorsEnum.m

@@ -9 +9 @@
 %      macro=ResponseDescriptorsEnum()
 
-macro=315;
+macro=318;

issm/trunk/src/m/enum/RhoIceEnum.m

@@ -9 +9 @@
 %      macro=RhoIceEnum()
 
-macro=251;
+macro=253;

issm/trunk/src/m/enum/RhoWaterEnum.m

@@ -9 +9 @@
 %      macro=RhoWaterEnum()
 
-macro=252;
+macro=254;

issm/trunk/src/m/enum/ScaledEnum.m

@@ -9 +9 @@
 %      macro=ScaledEnum()
 
-macro=313;
+macro=316;

issm/trunk/src/m/enum/SeparateEnum.m

@@ -9 +9 @@
 %      macro=SeparateEnum()
 
-macro=259;
+macro=261;

issm/trunk/src/m/enum/SparsityEnum.m

@@ -9 +9 @@
 %      macro=SparsityEnum()
 
-macro=317;
+macro=320;

issm/trunk/src/m/enum/SsetEnum.m

@@ -9 +9 @@
 %      macro=SsetEnum()
 
-macro=326;
+macro=329;

issm/trunk/src/m/enum/StringToEnum.m

@@ -246 +246 @@
                         elseif (strcmpi(name,'Time')), enum=TimeEnum(); return
                         elseif (strcmpi(name,'OutputFrequency')), enum=OutputFrequencyEnum(); return
+                        elseif (strcmpi(name,'IoGather')), enum=IoGatherEnum(); return
+                        elseif (strcmpi(name,'IoSplit')), enum=IoSplitEnum(); return
                         elseif (strcmpi(name,'MinVel')), enum=MinVelEnum(); return
                         elseif (strcmpi(name,'MaxVel')), enum=MaxVelEnum(); return
@@ -309 +311 @@
                         elseif (strcmpi(name,'OptScal')), enum=OptScalEnum(); return
                         elseif (strcmpi(name,'OutputFilePointer')), enum=OutputFilePointerEnum(); return
+                        elseif (strcmpi(name,'OutputFileName')), enum=OutputFileNameEnum(); return
                         elseif (strcmpi(name,'ParameterOutput')), enum=ParameterOutputEnum(); return
                         elseif (strcmpi(name,'PenaltyMelting')), enum=PenaltyMeltingEnum(); return

issm/trunk/src/m/enum/ThermalConductivityEnum.m

@@ -9 +9 @@
 %      macro=ThermalConductivityEnum()
 
-macro=254;
+macro=256;

issm/trunk/src/m/enum/ThermalExchangeVelocityEnum.m

@@ -9 +9 @@
 %      macro=ThermalExchangeVelocityEnum()
 
-macro=256;
+macro=258;

issm/trunk/src/m/enum/TolXEnum.m

@@ -9 +9 @@
 %      macro=TolXEnum()
 
-macro=318;
+macro=321;

issm/trunk/src/m/enum/VariableDescriptorsEnum.m

@@ -9 +9 @@
 %      macro=VariableDescriptorsEnum()
 
-macro=319;
+macro=322;

issm/trunk/src/m/enum/VerboseEnum.m

@@ -9 +9 @@
 %      macro=VerboseEnum()
 
-macro=320;
+macro=323;

issm/trunk/src/m/enum/WaitOnLockEnum.m

@@ -9 +9 @@
 %      macro=WaitOnLockEnum()
 
-macro=321;
+macro=324;

issm/trunk/src/m/enum/YtsEnum.m

@@ -9 +9 @@
 %      macro=YtsEnum()
 
-macro=327;
+macro=330;