Changeset 20465


Ignore:
Timestamp:
04/07/16 15:39:28 (9 years ago)
Author:
jbondzio
Message:

CHG: renaming SpcLevelset to Spclevelset for naming consistency

Location:
issm/trunk-jpl/src
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp

    r20461 r20465  
    1212
    1313void LevelsetAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
    14         IoModelToConstraintsx(constraints,iomodel,SpcLevelsetEnum,LevelsetAnalysisEnum,P1Enum);
     14        IoModelToConstraintsx(constraints,iomodel,SpclevelsetEnum,LevelsetAnalysisEnum,P1Enum);
    1515}
    1616/*}}}*/

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

    r20461 r20465  
    10411041        /*}}}*/
    10421042        /*Levelset related enums (will be moved to appropriate place when finished){{{*/
    1043         SpcLevelsetEnum,
     1043        SpclevelsetEnum,
    10441044        ExtrapolationVariableEnum,
    10451045        IceMaskNodeActivationEnum,

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

    r20461 r20465  
    995995                case ArrheniusEnum : return "Arrhenius";
    996996                case LliboutryDuvalEnum : return "LliboutryDuval";
    997                 case SpcLevelsetEnum : return "SpcLevelset";
     997                case SpclevelsetEnum : return "Spclevelset";
    998998                case ExtrapolationVariableEnum : return "ExtrapolationVariable";
    999999                case IceMaskNodeActivationEnum : return "IceMaskNodeActivation";

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

    r20461 r20465  
    10191019              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
    10201020              else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
    1021               else if (strcmp(name,"SpcLevelset")==0) return SpcLevelsetEnum;
     1021              else if (strcmp(name,"Spclevelset")==0) return SpclevelsetEnum;
    10221022              else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
    10231023              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;

  • issm/trunk-jpl/src/m/classes/levelset.js

    r20460 r20465  
    3333                this.marshall=function(md,fid) { //{{{
    3434                        WriteData(fid,'object',self,'class','levelset','fieldname','stabilization','format','Integer');
    35                         WriteData(fid,'enum',SpcLevelsetEnum(),'data',this.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
     35                        WriteData(fid,'enum',SpclevelsetEnum(),'data',this.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    3636                        WriteData(fid,'object',self,'class','levelset','fieldname','reinit_frequency','format','Integer');
    3737

  • issm/trunk-jpl/src/m/enum/EnumDefinitions.js

    r20461 r20465  
    980980function ArrheniusEnum(){ return 976;}
    981981function LliboutryDuvalEnum(){ return 977;}
    982 function SpcLevelsetEnum(){ return 978;}
     982function SpclevelsetEnum(){ return 978;}
    983983function ExtrapolationVariableEnum(){ return 979;}
    984984function IceMaskNodeActivationEnum(){ return 980;}

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

    r20461 r20465  
    987987def ArrheniusEnum(): return StringToEnum("Arrhenius")[0]
    988988def LliboutryDuvalEnum(): return StringToEnum("LliboutryDuval")[0]
    989 def SpcLevelsetEnum(): return StringToEnum("SpcLevelset")[0]
     989def SpclevelsetEnum(): return StringToEnum("Spclevelset")[0]
    990990def ExtrapolationVariableEnum(): return StringToEnum("ExtrapolationVariable")[0]
    991991def IceMaskNodeActivationEnum(): return StringToEnum("IceMaskNodeActivation")[0]

  • issm/trunk-jpl/src/py3/classes/calving.py

    r19903 r20465  
    6666                WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
    6767                WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
    68                 WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
     68                WriteData(fid,'enum',SpclevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    6969                WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
    7070                WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)

  • issm/trunk-jpl/src/py3/classes/calvinglevermann.py

    r19903 r20465  
    6363                WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer');
    6464                WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
    65                 WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
     65                WriteData(fid,'enum',SpclevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
    6666                WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1)
    6767                WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)

  • issm/trunk-jpl/src/py3/enum/EnumDefinitions.py

    r19895 r20465  
    954954def LliboutryDuvalEnum(): return StringToEnum("LliboutryDuval")[0]
    955955def TransientIslevelsetEnum(): return StringToEnum("TransientIslevelset")[0]
    956 def SpcLevelsetEnum(): return StringToEnum("SpcLevelset")[0]
     956def SpclevelsetEnum(): return StringToEnum("Spclevelset")[0]
    957957def ExtrapolationVariableEnum(): return StringToEnum("ExtrapolationVariable")[0]
    958958def IceMaskNodeActivationEnum(): return StringToEnum("IceMaskNodeActivation")[0]
Note: See TracChangeset for help on using the changeset viewer.