Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 20451) +++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 20452) @@ -48,11 +48,11 @@ iomodel->FetchDataToInput(elements,VyEnum); - /*Get calving parameters*/ - bool iscalving; + /*Get moving front parameters*/ + bool ismovingfront; int calvinglaw; - iomodel->Constant(&iscalving,TransientIscalvingEnum); - if(iscalving){ + iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); + if(ismovingfront){ iomodel->Constant(&calvinglaw,CalvingLawEnum); - iomodel->Constant(&iscalving,TransientIscalvingEnum); + iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); switch(calvinglaw){ case DefaultCalvingEnum: @@ -129,5 +129,5 @@ /*Intermediaries */ int stabilization,dim, domaintype, calvinglaw; - bool iscalving; + bool ismovingfront; int i, row, col; IssmDouble kappa; @@ -138,6 +138,6 @@ IssmDouble* xyz_list = NULL; - /*Get problem dimension and whether there is calving or not*/ - basalelement->FindParam(&iscalving,TransientIscalvingEnum); + /*Get problem dimension and whether there is moving front or not*/ + basalelement->FindParam(&ismovingfront,TransientIsmovingfrontEnum); basalelement->FindParam(&domaintype,DomainTypeEnum); basalelement->FindParam(&calvinglaw,CalvingLawEnum); @@ -194,5 +194,5 @@ /*Load calving inputs*/ - if(iscalving){ + if(ismovingfront){ switch(calvinglaw){ case DefaultCalvingEnum: @@ -267,5 +267,5 @@ /*Get calving speed*/ - if(iscalving){ + if(ismovingfront){ switch(calvinglaw){ case DefaultCalvingEnum: Index: /issm/trunk-jpl/src/c/cores/levelset_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/levelset_core.cpp (revision 20451) +++ /issm/trunk-jpl/src/c/cores/levelset_core.cpp (revision 20452) @@ -13,5 +13,5 @@ /* intermediaries */ - bool save_results,isstressbalance,ismasstransport,isthermal,isenthalpy,islevelset,iscalving; + bool save_results,isstressbalance,ismasstransport,isthermal,isenthalpy,islevelset,ismovingfront; int domaintype, num_extrapol_vars, index; int* extrapol_vars=NULL; @@ -25,5 +25,5 @@ femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum); femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); - femmodel->parameters->FindParam(&iscalving,TransientIscalvingEnum); + femmodel->parameters->FindParam(&ismovingfront,TransientIsmovingfrontEnum); if(isthermal && domaintype==Domain3DEnum) femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum); @@ -31,5 +31,5 @@ /* start the work from here */ - if(iscalving) Calvingx(femmodel); + if(ismovingfront) Calvingx(femmodel); if(VerboseSolution()) _printf0_(" computing levelset transport\n"); /* smoothen slope of lsf for computation of normal on ice domain*/ Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 20451) +++ /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 20452) @@ -21,5 +21,5 @@ /*parameters: */ IssmDouble starttime,finaltime,dt,yts; - bool isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,islevelset,isdamageevolution,ishydrology,iscalving; + bool isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,islevelset,isdamageevolution,ishydrology,ismovingfront; bool save_results,dakota_analysis; bool time_adapt; @@ -58,5 +58,5 @@ femmodel->parameters->FindParam(&ishydrology,TransientIshydrologyEnum); femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum); - femmodel->parameters->FindParam(&iscalving,TransientIscalvingEnum); + femmodel->parameters->FindParam(&ismovingfront,TransientIsmovingfrontEnum); if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum); femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 20451) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 20452) @@ -83,5 +83,5 @@ parameters->AddObject(iomodel->CopyConstantObject(TransientIsdamageevolutionEnum)); parameters->AddObject(iomodel->CopyConstantObject(TransientIshydrologyEnum)); - parameters->AddObject(iomodel->CopyConstantObject(TransientIscalvingEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TransientIsmovingfrontEnum)); parameters->AddObject(iomodel->CopyConstantObject(TransientIsslrEnum)); parameters->AddObject(iomodel->CopyConstantObject(TransientIscouplerEnum)); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 20451) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 20452) @@ -376,5 +376,5 @@ TransientIsdamageevolutionEnum, TransientIshydrologyEnum, - TransientIscalvingEnum, + TransientIsmovingfrontEnum, TransientIsslrEnum, TransientNumRequestedOutputsEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 20451) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 20452) @@ -380,5 +380,5 @@ case TransientIsdamageevolutionEnum : return "TransientIsdamageevolution"; case TransientIshydrologyEnum : return "TransientIshydrology"; - case TransientIscalvingEnum : return "TransientIscalving"; + case TransientIsmovingfrontEnum : return "TransientIsmovingfront"; case TransientIsslrEnum : return "TransientIsslr"; case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 20451) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 20452) @@ -389,5 +389,5 @@ else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum; else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum; - else if (strcmp(name,"TransientIscalving")==0) return TransientIscalvingEnum; + else if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum; else if (strcmp(name,"TransientIsslr")==0) return TransientIsslrEnum; else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum; Index: /issm/trunk-jpl/src/m/classes/calving.js =================================================================== --- /issm/trunk-jpl/src/m/classes/calving.js (revision 20451) +++ /issm/trunk-jpl/src/m/classes/calving.js (revision 20452) @@ -26,5 +26,5 @@ this.checkconsistency = function(md,solution,analyses) { // {{{ //Early return - if (solution!=TransientSolutionEnum() | md.trans.iscalving==0) return; + if (solution!=TransientSolutionEnum() | md.trans.ismovingfront==0) return; checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); Index: /issm/trunk-jpl/src/m/classes/calving.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calving.m (revision 20451) +++ /issm/trunk-jpl/src/m/classes/calving.m (revision 20452) @@ -43,5 +43,5 @@ function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return - if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end + if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); Index: /issm/trunk-jpl/src/m/classes/calving.py =================================================================== --- /issm/trunk-jpl/src/m/classes/calving.py (revision 20451) +++ /issm/trunk-jpl/src/m/classes/calving.py (revision 20452) @@ -50,5 +50,5 @@ #Early return - if (solution!=TransientSolutionEnum()) or (not md.transient.iscalving): + if (solution!=TransientSolutionEnum()) or (not md.transient.ismovingfront): return md Index: /issm/trunk-jpl/src/m/classes/calvingdev.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvingdev.m (revision 20451) +++ /issm/trunk-jpl/src/m/classes/calvingdev.m (revision 20452) @@ -45,5 +45,5 @@ function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return - if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end + if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); Index: /issm/trunk-jpl/src/m/classes/calvinglevermann.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvinglevermann.m (revision 20451) +++ /issm/trunk-jpl/src/m/classes/calvinglevermann.m (revision 20452) @@ -45,5 +45,5 @@ function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return - if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end + if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); Index: /issm/trunk-jpl/src/m/classes/calvinglevermann.py =================================================================== --- /issm/trunk-jpl/src/m/classes/calvinglevermann.py (revision 20451) +++ /issm/trunk-jpl/src/m/classes/calvinglevermann.py (revision 20452) @@ -50,5 +50,5 @@ #Early return - if (solution!=TransientSolutionEnum()) or (not md.transient.iscalving): + if (solution!=TransientSolutionEnum()) or (not md.transient.ismovingfront): return md Index: /issm/trunk-jpl/src/m/classes/calvingpi.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvingpi.m (revision 20451) +++ /issm/trunk-jpl/src/m/classes/calvingpi.m (revision 20452) @@ -45,5 +45,5 @@ function md = checkconsistency(self,md,solution,analyses) % {{{ %Early return - if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end + if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); Index: /issm/trunk-jpl/src/m/classes/trans.js =================================================================== --- /issm/trunk-jpl/src/m/classes/trans.js (revision 20451) +++ /issm/trunk-jpl/src/m/classes/trans.js (revision 20452) @@ -17,5 +17,5 @@ this.isdamageevolution = 0; this.islevelset = 0; - this.iscalving = 0; + this.ismovingfront = 0; this.ishydrology = 0; this.isslr = 0; @@ -38,5 +38,5 @@ fielddisplay(this,'isdamageevolution','indicates whether damage evolution is used in the transient'); fielddisplay(this,'islevelset','LEVEL SET DESCRIPTION...'); - fielddisplay(this,'iscalving','indicates whether calving is used in the transient'); + fielddisplay(this,'ismovingfront','indicates whether a moving front capability is used in the transient'); fielddisplay(this,'ishydrology','indicates whether an hydrology model is used'); fielddisplay(this,'isslr','indicates whether a sea-level rise model is used'); @@ -62,5 +62,5 @@ checkfield(md,'fieldname','trans.isdamageevolution','numel',[1],'values',[0, 1]); checkfield(md,'fieldname','trans.islevelset','numel',[1],'values',[0, 1]); - checkfield(md,'fieldname','trans.iscalving','numel',[1],'values',[0, 1]); + checkfield(md,'fieldname','trans.ismovingfront','numel',[1],'values',[0, 1]); checkfield(md,'fieldname','trans.ishydrology','numel',[1],'values',[0 ,1]); checkfield(md,'fieldname','trans.iscoupler','numel',[1],'values',[0 ,1]); @@ -78,5 +78,5 @@ WriteData(fid,'object',this,'fieldname','ishydrology','format','Boolean'); WriteData(fid,'object',this,'fieldname','islevelset','format','Boolean'); - WriteData(fid,'object',this,'fieldname','iscalving','format','Boolean'); + WriteData(fid,'object',this,'fieldname','ismovingfront','format','Boolean'); WriteData(fid,'object',this,'fieldname','isslr','format','Boolean'); WriteData(fid,'object',this,'fieldname','iscoupler','format','Boolean'); @@ -110,5 +110,5 @@ this.isdamageevolution = 0; this.islevelset = 0; - this.iscalving = 0; + this.ismovingfront = 0; this.ishydrology = 0; this.isslr = 0; Index: /issm/trunk-jpl/src/m/classes/transient.m =================================================================== --- /issm/trunk-jpl/src/m/classes/transient.m (revision 20451) +++ /issm/trunk-jpl/src/m/classes/transient.m (revision 20452) @@ -14,8 +14,8 @@ isdamageevolution = 0; islevelset = 0; - iscalving = 0; + ismovingfront = 0; ishydrology = 0; isslr = 0; - iscoupler = 0; + iscoupler = 0; requested_outputs = {}; end @@ -40,8 +40,8 @@ self.isdamageevolution = 0; self.islevelset = 0; - self.iscalving =0; + self.ismovingfront =0; self.ishydrology = 0; self.isslr = 0; - self.iscoupler = 0; + self.iscoupler = 0; %default output @@ -59,8 +59,8 @@ self.isdamageevolution = 0; self.islevelset = 0; - self.iscalving = 0; + self.ismovingfront = 0; self.ishydrology = 0; self.isslr = 0; - self.iscoupler = 0; + self.iscoupler = 0; %default output @@ -87,5 +87,5 @@ md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0 1]); md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0 1]); - md = checkfield(md,'fieldname','transient.iscalving','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','transient.ismovingfront','numel',[1],'values',[0 1]); md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 1]); md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1); @@ -105,5 +105,5 @@ fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient'); fielddisplay(self,'islevelset','LEVEL SET DESCRIPTION...'); - fielddisplay(self,'iscalving','indicates whether calving is used in the transient'); + fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient'); fielddisplay(self,'ishydrology','indicates whether an hydrology model is used'); fielddisplay(self,'isslr','indicates whether a sea-level rise solution is used in the transient'); @@ -122,5 +122,5 @@ WriteData(fid,'object',self,'fieldname','ishydrology','format','Boolean'); WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean'); - WriteData(fid,'object',self,'fieldname','iscalving','format','Boolean'); + WriteData(fid,'object',self,'fieldname','ismovingfront','format','Boolean'); WriteData(fid,'object',self,'fieldname','isslr','format','Boolean'); WriteData(fid,'object',self,'fieldname','iscoupler','format','Boolean'); @@ -145,5 +145,5 @@ writejsdouble(fid,[modelname '.trans.isdamageevolution'],self.isdamageevolution); writejsdouble(fid,[modelname '.trans.islevelset'],self.islevelset); - writejsdouble(fid,[modelname '.trans.iscalving'],self.iscalving); + writejsdouble(fid,[modelname '.trans.ismovingfront'],self.ismovingfront); writejsdouble(fid,[modelname '.trans.ishydrology'],self.ishydrology); writejsdouble(fid,[modelname '.trans.isslr'],self.isslr); Index: /issm/trunk-jpl/src/m/classes/transient.py =================================================================== --- /issm/trunk-jpl/src/m/classes/transient.py (revision 20451) +++ /issm/trunk-jpl/src/m/classes/transient.py (revision 20452) @@ -21,5 +21,5 @@ self.isdamageevolution = False self.islevelset = False - self.iscalving = False + self.ismovingfront = False self.ishydrology = False self.isslr = False @@ -41,5 +41,5 @@ string="%s\n%s"%(string,fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient')) string="%s\n%s"%(string,fielddisplay(self,'islevelset','LEVELSET METHOD DESCRIPTION')) - string="%s\n%s"%(string,fielddisplay(self,'iscalving','indicates whether calving is used in the transient')) + string="%s\n%s"%(string,fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient')) string="%s\n%s"%(string,fielddisplay(self,'ishydrology','indicates whether an hydrology model is used')) string="%s\n%s"%(string,fielddisplay(self,'isslr','indicates if a sea level rise solution is used in the transient')) @@ -67,5 +67,5 @@ self.isdamageevolution = False self.islevelset = False - self.iscalving = False + self.ismovingfront = False self.ishydrology = False self.isslr = False @@ -87,5 +87,5 @@ self.isdamageevolution = False self.islevelset = False - self.iscalving = False + self.ismovingfront = False self.ishydrology = False self.isslr = False @@ -111,5 +111,5 @@ md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0,1]) md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0,1]) - md = checkfield(md,'fieldname','transient.iscalving','numel',[1],'values',[0,1]); + md = checkfield(md,'fieldname','transient.ismovingfront','numel',[1],'values',[0,1]); md = checkfield(md,'fieldname','transient.isslr','numel',[1],'values',[0,1]) md = checkfield(md,'fieldname','transient.iscoupler','numel',[1],'values',[0,1]) @@ -128,5 +128,5 @@ WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean') WriteData(fid,'object',self,'fieldname','ishydrology','format','Boolean') - WriteData(fid,'object',self,'fieldname','iscalving','format','Boolean') + WriteData(fid,'object',self,'fieldname','ismovingfront','format','Boolean') WriteData(fid,'object',self,'fieldname','isslr','format','Boolean') WriteData(fid,'object',self,'fieldname','iscoupler','format','Boolean') Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.js =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.js (revision 20451) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.js (revision 20452) @@ -365,5 +365,5 @@ function TransientIsdamageevolutionEnum(){ return 361;} function TransientIshydrologyEnum(){ return 362;} -function TransientIscalvingEnum(){ return 363;} +function TransientIsmovingfrontEnum(){ return 363;} function TransientIsslrEnum(){ return 364;} function TransientNumRequestedOutputsEnum(){ return 365;} Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 20451) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 20452) @@ -372,5 +372,5 @@ def TransientIsdamageevolutionEnum(): return StringToEnum("TransientIsdamageevolution")[0] def TransientIshydrologyEnum(): return StringToEnum("TransientIshydrology")[0] -def TransientIscalvingEnum(): return StringToEnum("TransientIscalving")[0] +def TransientIsmovingfrontEnum(): return StringToEnum("TransientIsmovingfront")[0] def TransientIsslrEnum(): return StringToEnum("TransientIsslr")[0] def TransientNumRequestedOutputsEnum(): return StringToEnum("TransientNumRequestedOutputs")[0] Index: sm/trunk-jpl/src/m/enum/TransientIscalvingEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/TransientIscalvingEnum.m (revision 20451) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=TransientIscalvingEnum() -%TRANSIENTISCALVINGENUM - Enum of TransientIscalving -% -% 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=TransientIscalvingEnum() - -macro=StringToEnum('TransientIscalving'); Index: /issm/trunk-jpl/src/m/enum/TransientIsmovingfrontEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/TransientIsmovingfrontEnum.m (revision 20452) +++ /issm/trunk-jpl/src/m/enum/TransientIsmovingfrontEnum.m (revision 20452) @@ -0,0 +1,11 @@ +function macro=TransientIsmovingfrontEnum() +%TRANSIENTISMOVINGFRONTENUM - Enum of TransientIsmovingfront +% +% 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=TransientIsmovingfrontEnum() + +macro=StringToEnum('TransientIsmovingfront'); Index: /issm/trunk-jpl/test/NightlyRun/test801.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test801.m (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test801.m (revision 20452) @@ -9,5 +9,5 @@ md.transient.isstressbalance=1; md.transient.islevelset=1; -md.transient.iscalving=1; +md.transient.ismovingfront=1; md.transient.ismasstransport=1; md.transient.issmb=1; Index: /issm/trunk-jpl/test/NightlyRun/test801.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test801.py (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test801.py (revision 20452) @@ -19,5 +19,5 @@ md.transient.isstressbalance=True md.transient.islevelset=True -md.transient.iscalving=True +md.transient.ismovingfront=True md.transient.ismasstransport=True md.transient.issmb=True Index: /issm/trunk-jpl/test/NightlyRun/test802.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test802.m (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test802.m (revision 20452) @@ -14,5 +14,5 @@ md.transient.isstressbalance=1; md.transient.islevelset=1; -md.transient.iscalving=1; +md.transient.ismovingfront=1; md.transient.ismasstransport=1; md.transient.issmb=1; Index: /issm/trunk-jpl/test/NightlyRun/test802.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test802.py (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test802.py (revision 20452) @@ -24,5 +24,5 @@ md.transient.isstressbalance=True md.transient.islevelset=True -md.transient.iscalving=True +md.transient.ismovingfront=True md.transient.ismasstransport=True md.transient.issmb=True Index: /issm/trunk-jpl/test/NightlyRun/test803.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test803.m (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test803.m (revision 20452) @@ -16,5 +16,5 @@ md.transient.isstressbalance=1; md.transient.islevelset=1; -md.transient.iscalving=1; +md.transient.ismovingfront=1; md.transient.ismasstransport=1; md.transient.issmb=1; Index: /issm/trunk-jpl/test/NightlyRun/test803.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test803.py (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test803.py (revision 20452) @@ -26,5 +26,5 @@ md.transient.isstressbalance=True md.transient.islevelset=True -md.transient.iscalving=True +md.transient.ismovingfront=True md.transient.ismasstransport=True md.transient.issmb=True Index: /issm/trunk-jpl/test/NightlyRun/test804.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test804.m (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test804.m (revision 20452) @@ -14,5 +14,5 @@ md.transient.isgroundingline=1; md.transient.isgia=0; -md.transient.iscalving=1; +md.transient.ismovingfront=1; md.calving.calvingrate=1000.*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test804.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test804.py (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test804.py (revision 20452) @@ -24,5 +24,5 @@ md.transient.isgroundingline=True md.transient.isgia=False -md.transient.iscalving=True; +md.transient.ismovingfront=True; md.calving.calvingrate=1000.*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/NightlyRun/test805.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test805.m (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test805.m (revision 20452) @@ -21,5 +21,5 @@ md.transient.isgroundingline=1; md.transient.isgia=0; -md.transient.iscalving=1; +md.transient.ismovingfront=1; md.calving.calvingrate=1000.*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test805.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test805.py (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test805.py (revision 20452) @@ -31,5 +31,5 @@ md.transient.isgroundingline=True md.transient.isgia=False -md.transient.iscalving=True; +md.transient.ismovingfront=True; md.calving.calvingrate=1000.*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/NightlyRun/test806.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test806.m (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test806.m (revision 20452) @@ -24,5 +24,5 @@ md.transient.isgroundingline=0; md.transient.isgia=0; -md.transient.iscalving=1; +md.transient.ismovingfront=1; md.calving=calvinglevermann(); Index: /issm/trunk-jpl/test/NightlyRun/test806.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test806.py (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test806.py (revision 20452) @@ -35,5 +35,5 @@ md.transient.isgroundingline=False md.transient.isgia=False -md.transient.iscalving=True; +md.transient.ismovingfront=True; md.calving=calvinglevermann() Index: /issm/trunk-jpl/test/NightlyRun/test807.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test807.m (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test807.m (revision 20452) @@ -24,5 +24,5 @@ md.transient.isgroundingline=0; md.transient.isgia=0; -md.transient.iscalving=1; +md.transient.ismovingfront=1; md.calving.calvingrate=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test807.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test807.py (revision 20451) +++ /issm/trunk-jpl/test/NightlyRun/test807.py (revision 20452) @@ -35,5 +35,5 @@ md.transient.isgroundingline=False md.transient.isgia=False -md.transient.iscalving=True; +md.transient.ismovingfront=True; md.calving.calvingrate=numpy.zeros((md.mesh.numberofvertices,1))