source: issm/oecreview/Archive/19101-20495/ISSM-20464-20465.diff@ 20498

Last change on this file since 20498 was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495
File size: 8.5 KB

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

     
    1111#include "../solutionsequences/solutionsequences.h"
    1212
    1313void LevelsetAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
    14         IoModelToConstraintsx(constraints,iomodel,SpcLevelsetEnum,LevelsetAnalysisEnum,P1Enum);
     14        IoModelToConstraintsx(constraints,iomodel,SpclevelsetEnum,LevelsetAnalysisEnum,P1Enum);
    1515}
    1616/*}}}*/
    1717void LevelsetAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/

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

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

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

     
    994994                case PatersonEnum : return "Paterson";
    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";
    10001000                case LevelsetfunctionSlopeXEnum : return "LevelsetfunctionSlopeX";

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

     
    10181018              else if (strcmp(name,"Paterson")==0) return PatersonEnum;
    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;
    10241024              else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;

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

     
    6262                yts=365.*24.*3600.
    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)
    6868        # }}}

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

     
    6565
    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)
    7171        # }}}

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

     
    953953def ArrheniusEnum(): return StringToEnum("Arrhenius")[0]
    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]
    959959def LevelsetfunctionSlopeXEnum(): return StringToEnum("LevelsetfunctionSlopeX")[0]

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

     
    3232        } //}}}
    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
    3838                }//}}}

  • ../trunk-jpl/src/m/enum/SpclevelsetEnum.m

     
     1function macro=SpclevelsetEnum()
     2%SPCLEVELSETENUM - Enum of Spclevelset
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=SpclevelsetEnum()
     10
     11macro=StringToEnum('Spclevelset');

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

     
    979979function PatersonEnum(){ return 975;}
    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;}
    985985function LevelsetfunctionSlopeXEnum(){ return 981;}

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

     
    986986def PatersonEnum(): return StringToEnum("Paterson")[0]
    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]
    992992def LevelsetfunctionSlopeXEnum(): return StringToEnum("LevelsetfunctionSlopeX")[0]
Note: See TracBrowser for help on using the repository browser.