Index: ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 20464) +++ ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 20465) @@ -11,7 +11,7 @@ #include "../solutionsequences/solutionsequences.h" void LevelsetAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ - IoModelToConstraintsx(constraints,iomodel,SpcLevelsetEnum,LevelsetAnalysisEnum,P1Enum); + IoModelToConstraintsx(constraints,iomodel,SpclevelsetEnum,LevelsetAnalysisEnum,P1Enum); } /*}}}*/ void LevelsetAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/ Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 20464) +++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 20465) @@ -1040,7 +1040,7 @@ LliboutryDuvalEnum, /*}}}*/ /*Levelset related enums (will be moved to appropriate place when finished){{{*/ - SpcLevelsetEnum, + SpclevelsetEnum, ExtrapolationVariableEnum, IceMaskNodeActivationEnum, LevelsetfunctionSlopeXEnum, Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 20464) +++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 20465) @@ -994,7 +994,7 @@ case PatersonEnum : return "Paterson"; case ArrheniusEnum : return "Arrhenius"; case LliboutryDuvalEnum : return "LliboutryDuval"; - case SpcLevelsetEnum : return "SpcLevelset"; + case SpclevelsetEnum : return "Spclevelset"; case ExtrapolationVariableEnum : return "ExtrapolationVariable"; case IceMaskNodeActivationEnum : return "IceMaskNodeActivation"; case LevelsetfunctionSlopeXEnum : return "LevelsetfunctionSlopeX"; Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 20464) +++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 20465) @@ -1018,7 +1018,7 @@ else if (strcmp(name,"Paterson")==0) return PatersonEnum; else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum; - else if (strcmp(name,"SpcLevelset")==0) return SpcLevelsetEnum; + else if (strcmp(name,"Spclevelset")==0) return SpclevelsetEnum; else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum; else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum; else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum; Index: ../trunk-jpl/src/py3/classes/calvinglevermann.py =================================================================== --- ../trunk-jpl/src/py3/classes/calvinglevermann.py (revision 20464) +++ ../trunk-jpl/src/py3/classes/calvinglevermann.py (revision 20465) @@ -62,7 +62,7 @@ yts=365.*24.*3600. WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer'); WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer'); - WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'enum',SpclevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1) WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts) # }}} Index: ../trunk-jpl/src/py3/classes/calving.py =================================================================== --- ../trunk-jpl/src/py3/classes/calving.py (revision 20464) +++ ../trunk-jpl/src/py3/classes/calving.py (revision 20465) @@ -65,7 +65,7 @@ WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer'); WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer'); - WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'enum',SpclevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts) WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts) # }}} Index: ../trunk-jpl/src/py3/enum/EnumDefinitions.py =================================================================== --- ../trunk-jpl/src/py3/enum/EnumDefinitions.py (revision 20464) +++ ../trunk-jpl/src/py3/enum/EnumDefinitions.py (revision 20465) @@ -953,7 +953,7 @@ def ArrheniusEnum(): return StringToEnum("Arrhenius")[0] def LliboutryDuvalEnum(): return StringToEnum("LliboutryDuval")[0] def TransientIslevelsetEnum(): return StringToEnum("TransientIslevelset")[0] -def SpcLevelsetEnum(): return StringToEnum("SpcLevelset")[0] +def SpclevelsetEnum(): return StringToEnum("Spclevelset")[0] def ExtrapolationVariableEnum(): return StringToEnum("ExtrapolationVariable")[0] def IceMaskNodeActivationEnum(): return StringToEnum("IceMaskNodeActivation")[0] def LevelsetfunctionSlopeXEnum(): return StringToEnum("LevelsetfunctionSlopeX")[0] Index: ../trunk-jpl/src/m/classes/levelset.js =================================================================== --- ../trunk-jpl/src/m/classes/levelset.js (revision 20464) +++ ../trunk-jpl/src/m/classes/levelset.js (revision 20465) @@ -32,7 +32,7 @@ } //}}} this.marshall=function(md,fid) { //{{{ WriteData(fid,'object',self,'class','levelset','fieldname','stabilization','format','Integer'); - WriteData(fid,'enum',SpcLevelsetEnum(),'data',this.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); + WriteData(fid,'enum',SpclevelsetEnum(),'data',this.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1); WriteData(fid,'object',self,'class','levelset','fieldname','reinit_frequency','format','Integer'); }//}}} Index: ../trunk-jpl/src/m/enum/SpclevelsetEnum.m =================================================================== --- ../trunk-jpl/src/m/enum/SpclevelsetEnum.m (revision 0) +++ ../trunk-jpl/src/m/enum/SpclevelsetEnum.m (revision 20465) @@ -0,0 +1,11 @@ +function macro=SpclevelsetEnum() +%SPCLEVELSETENUM - Enum of Spclevelset +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=SpclevelsetEnum() + +macro=StringToEnum('Spclevelset'); Index: ../trunk-jpl/src/m/enum/EnumDefinitions.js =================================================================== --- ../trunk-jpl/src/m/enum/EnumDefinitions.js (revision 20464) +++ ../trunk-jpl/src/m/enum/EnumDefinitions.js (revision 20465) @@ -979,7 +979,7 @@ function PatersonEnum(){ return 975;} function ArrheniusEnum(){ return 976;} function LliboutryDuvalEnum(){ return 977;} -function SpcLevelsetEnum(){ return 978;} +function SpclevelsetEnum(){ return 978;} function ExtrapolationVariableEnum(){ return 979;} function IceMaskNodeActivationEnum(){ return 980;} function LevelsetfunctionSlopeXEnum(){ return 981;} Index: ../trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 20464) +++ ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 20465) @@ -986,7 +986,7 @@ def PatersonEnum(): return StringToEnum("Paterson")[0] def ArrheniusEnum(): return StringToEnum("Arrhenius")[0] def LliboutryDuvalEnum(): return StringToEnum("LliboutryDuval")[0] -def SpcLevelsetEnum(): return StringToEnum("SpcLevelset")[0] +def SpclevelsetEnum(): return StringToEnum("Spclevelset")[0] def ExtrapolationVariableEnum(): return StringToEnum("ExtrapolationVariable")[0] def IceMaskNodeActivationEnum(): return StringToEnum("IceMaskNodeActivation")[0] def LevelsetfunctionSlopeXEnum(): return StringToEnum("LevelsetfunctionSlopeX")[0]