Index: /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 20459) @@ -43,8 +43,8 @@ int finiteelement; - bool islevelset; + bool ismovingfront; iomodel->Constant(&finiteelement,DamageElementinterpEnum); - iomodel->Constant(&islevelset,TransientIslevelsetEnum); + iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); /*Update elements: */ Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 20459) @@ -107,5 +107,5 @@ void EnthalpyAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ - bool dakota_analysis,islevelset,isenthalpy; + bool dakota_analysis,ismovingfront,isenthalpy; int frictionlaw,basalforcing_model; int FrictionCoupling; @@ -132,5 +132,5 @@ iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); - iomodel->Constant(&islevelset,TransientIslevelsetEnum); + iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); iomodel->Constant(&frictionlaw,FrictionLawEnum); @@ -159,5 +159,5 @@ InputUpdateFromConstantx(elements,0.,VyMeshEnum); InputUpdateFromConstantx(elements,0.,VzMeshEnum); - if(islevelset){ + if(ismovingfront){ iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes } Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 20459) @@ -49,30 +49,25 @@ /*Get moving front parameters*/ - bool ismovingfront; int calvinglaw; - iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); - if(ismovingfront){ - iomodel->Constant(&calvinglaw,CalvingLawEnum); - iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); - switch(calvinglaw){ - case DefaultCalvingEnum: - iomodel->FetchDataToInput(elements,CalvingCalvingrateEnum); - iomodel->FetchDataToInput(elements,CalvingMeltingrateEnum); - break; - case CalvingLevermannEnum: - iomodel->FetchDataToInput(elements,CalvinglevermannCoeffEnum); - iomodel->FetchDataToInput(elements,CalvinglevermannMeltingrateEnum); - break; - case CalvingPiEnum: - iomodel->FetchDataToInput(elements,CalvingpiCoeffEnum); - iomodel->FetchDataToInput(elements,CalvingpiMeltingrateEnum); - break; - case CalvingDevEnum: - iomodel->FetchDataToInput(elements,CalvingpiCoeffEnum); - iomodel->FetchDataToInput(elements,CalvingMeltingrateEnum); - break; - default: - _error_("Calving law "<Constant(&calvinglaw,CalvingLawEnum); + switch(calvinglaw){ + case DefaultCalvingEnum: + iomodel->FetchDataToInput(elements,CalvingCalvingrateEnum); + iomodel->FetchDataToInput(elements,CalvingMeltingrateEnum); + break; + case CalvingLevermannEnum: + iomodel->FetchDataToInput(elements,CalvinglevermannCoeffEnum); + iomodel->FetchDataToInput(elements,CalvinglevermannMeltingrateEnum); + break; + case CalvingPiEnum: + iomodel->FetchDataToInput(elements,CalvingpiCoeffEnum); + iomodel->FetchDataToInput(elements,CalvingpiMeltingrateEnum); + break; + case CalvingDevEnum: + iomodel->FetchDataToInput(elements,CalvingpiCoeffEnum); + iomodel->FetchDataToInput(elements,CalvingMeltingrateEnum); + break; + default: + _error_("Calving law "<FindParam(&ismovingfront,TransientIsmovingfrontEnum); basalelement->FindParam(&domaintype,DomainTypeEnum); basalelement->FindParam(&calvinglaw,CalvingLawEnum); @@ -194,50 +187,48 @@ /*Load calving inputs*/ - if(ismovingfront){ - switch(calvinglaw){ - case DefaultCalvingEnum: - case CalvingDevEnum: - lsf_slopex_input = basalelement->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input); - if(dim==2) lsf_slopey_input = basalelement->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input); - calvingrate_input = basalelement->GetInput(CalvingCalvingrateEnum); _assert_(calvingrate_input); - meltingrate_input = basalelement->GetInput(CalvingMeltingrateEnum); _assert_(meltingrate_input); - break; - case CalvingLevermannEnum: - switch(domaintype){ - case Domain2DverticalEnum: - calvingratex_input=basalelement->GetInput(CalvingratexEnum); _assert_(calvingratex_input); - break; - case Domain2DhorizontalEnum: - calvingratex_input=basalelement->GetInput(CalvingratexEnum); _assert_(calvingratex_input); - calvingratey_input=basalelement->GetInput(CalvingrateyEnum); _assert_(calvingratey_input); - break; - case Domain3DEnum: - calvingratex_input=basalelement->GetInput(CalvingratexAverageEnum); _assert_(calvingratex_input); - calvingratey_input=basalelement->GetInput(CalvingrateyAverageEnum); _assert_(calvingratey_input); - break; - default: _error_("mesh "<GetInput(CalvinglevermannMeltingrateEnum); _assert_(meltingrate_input); - break; - case CalvingPiEnum: - switch(domaintype){ - case Domain2DverticalEnum: - calvingratex_input=basalelement->GetInput(CalvingratexEnum); _assert_(calvingratex_input); - break; - case Domain2DhorizontalEnum: - calvingratex_input=basalelement->GetInput(CalvingratexEnum); _assert_(calvingratex_input); - calvingratey_input=basalelement->GetInput(CalvingrateyEnum); _assert_(calvingratey_input); - break; - case Domain3DEnum: - calvingratex_input=basalelement->GetInput(CalvingratexAverageEnum); _assert_(calvingratex_input); - calvingratey_input=basalelement->GetInput(CalvingrateyAverageEnum); _assert_(calvingratey_input); - break; - default: _error_("mesh "<GetInput(CalvingpiMeltingrateEnum); _assert_(meltingrate_input); - break; - default: - _error_("Calving law "<GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input); + if(dim==2) lsf_slopey_input = basalelement->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input); + calvingrate_input = basalelement->GetInput(CalvingCalvingrateEnum); _assert_(calvingrate_input); + meltingrate_input = basalelement->GetInput(CalvingMeltingrateEnum); _assert_(meltingrate_input); + break; + case CalvingLevermannEnum: + switch(domaintype){ + case Domain2DverticalEnum: + calvingratex_input=basalelement->GetInput(CalvingratexEnum); _assert_(calvingratex_input); + break; + case Domain2DhorizontalEnum: + calvingratex_input=basalelement->GetInput(CalvingratexEnum); _assert_(calvingratex_input); + calvingratey_input=basalelement->GetInput(CalvingrateyEnum); _assert_(calvingratey_input); + break; + case Domain3DEnum: + calvingratex_input=basalelement->GetInput(CalvingratexAverageEnum); _assert_(calvingratex_input); + calvingratey_input=basalelement->GetInput(CalvingrateyAverageEnum); _assert_(calvingratey_input); + break; + default: _error_("mesh "<GetInput(CalvinglevermannMeltingrateEnum); _assert_(meltingrate_input); + break; + case CalvingPiEnum: + switch(domaintype){ + case Domain2DverticalEnum: + calvingratex_input=basalelement->GetInput(CalvingratexEnum); _assert_(calvingratex_input); + break; + case Domain2DhorizontalEnum: + calvingratex_input=basalelement->GetInput(CalvingratexEnum); _assert_(calvingratex_input); + calvingratey_input=basalelement->GetInput(CalvingrateyEnum); _assert_(calvingratey_input); + break; + case Domain3DEnum: + calvingratex_input=basalelement->GetInput(CalvingratexAverageEnum); _assert_(calvingratex_input); + calvingratey_input=basalelement->GetInput(CalvingrateyAverageEnum); _assert_(calvingratey_input); + break; + default: _error_("mesh "<GetInput(CalvingpiMeltingrateEnum); _assert_(meltingrate_input); + break; + default: + _error_("Calving law "<GetInputValue(&dlsf[0],gauss); - if(dim==2) lsf_slopey_input->GetInputValue(&dlsf[1],gauss); - calvingrate_input->GetInputValue(&calvingrate,gauss); - meltingrate_input->GetInputValue(&meltingrate,gauss); - - norm_dlsf=0.; - for(i=0;i1.e-10) - for(i=0;iGetInputValue(&c[0],gauss); - if(dim==2) calvingratey_input->GetInputValue(&c[1],gauss); - meltingrate_input->GetInputValue(&meltingrate,gauss); - norm_calving=0.; - for(i=0;iGetInputValue(&dlsf[0],gauss); + if(dim==2) lsf_slopey_input->GetInputValue(&dlsf[1],gauss); + calvingrate_input->GetInputValue(&calvingrate,gauss); + meltingrate_input->GetInputValue(&meltingrate,gauss); + + norm_dlsf=0.; + for(i=0;i1.e-10) + for(i=0;iGetInputValue(&c[0],gauss); + if(dim==2) calvingratey_input->GetInputValue(&c[1],gauss); + meltingrate_input->GetInputValue(&meltingrate,gauss); + norm_calving=0.; + for(i=0;iConstant(&dakota_analysis,QmuIsdakotaEnum); iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum); - iomodel->Constant(&islevelset,TransientIslevelsetEnum); + iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); /*Finite element type*/ Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 20459) @@ -678,5 +678,5 @@ bool control_analysis; bool dakota_analysis; - bool islevelset; + bool ismovingfront; bool isdamage; @@ -689,5 +689,5 @@ iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); iomodel->Constant(&materials_type,MaterialsEnum); - iomodel->Constant(&islevelset,TransientIslevelsetEnum); + iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); iomodel->Constant(&frictionlaw,FrictionLawEnum); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 20459) @@ -122,8 +122,8 @@ /*Fetch data needed: */ bool isSIA; - bool islevelset; + bool ismovingfront; int frictionlaw; iomodel->Constant(&isSIA,FlowequationIsSIAEnum); - iomodel->Constant(&islevelset,TransientIslevelsetEnum); + iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); iomodel->Constant(&frictionlaw,FrictionLawEnum); @@ -166,5 +166,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum); - if(islevelset){ + if(ismovingfront){ if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes Index: /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 20459) @@ -89,7 +89,7 @@ } - bool dakota_analysis, islevelset; + bool dakota_analysis, ismovingfront; iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); - iomodel->Constant(&islevelset,TransientIslevelsetEnum); + iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); iomodel->Constant(&frictionlaw,FrictionLawEnum); @@ -116,5 +116,5 @@ InputUpdateFromConstantx(elements,0.,VyMeshEnum); InputUpdateFromConstantx(elements,0.,VzMeshEnum); - if(islevelset){ + if(ismovingfront){ iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes } Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 20459) @@ -546,10 +546,10 @@ case TransientSolutionEnum:{ - bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,islevelset,ishydrology,isdamage,issmb,isslr; + bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslr; iomodel->Constant(&isSIA,FlowequationIsSIAEnum); iomodel->Constant(&isFS,FlowequationIsFSEnum); iomodel->Constant(&isthermal,TransientIsthermalEnum); iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum); - iomodel->Constant(&islevelset,TransientIslevelsetEnum); + iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); iomodel->Constant(&ismasstransport,TransientIsmasstransportEnum); iomodel->Constant(&isstressbalance,TransientIsstressbalanceEnum); @@ -585,5 +585,5 @@ } if(issmb) analyses_temp[numanalyses++]=SmbAnalysisEnum; - if(islevelset){ + if(ismovingfront){ analyses_temp[numanalyses++]=LevelsetAnalysisEnum; analyses_temp[numanalyses++]=ExtrapolationAnalysisEnum; Index: /issm/trunk-jpl/src/c/cores/movingfront_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/movingfront_core.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/cores/movingfront_core.cpp (revision 20459) @@ -24,12 +24,11 @@ femmodel->parameters->FindParam(&ismasstransport,TransientIsmasstransportEnum); femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum); - femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); femmodel->parameters->FindParam(&ismovingfront,TransientIsmovingfrontEnum); if(isthermal && domaintype==Domain3DEnum) femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum); - if(!islevelset) return; + if(!ismovingfront) return; /* start the work from here */ - if(ismovingfront) Calvingx(femmodel); + 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 20458) +++ /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 20459) @@ -21,5 +21,5 @@ /*parameters: */ IssmDouble starttime,finaltime,dt,yts; - bool isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,islevelset,isdamageevolution,ishydrology,ismovingfront; + bool isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,ismovingfront,isdamageevolution,ishydrology; bool save_results,dakota_analysis; bool time_adapt; @@ -54,9 +54,8 @@ femmodel->parameters->FindParam(&iscoupler,TransientIscouplerEnum); femmodel->parameters->FindParam(&isgroundingline,TransientIsgroundinglineEnum); - femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); + femmodel->parameters->FindParam(&ismovingfront,TransientIsmovingfrontEnum); femmodel->parameters->FindParam(&isdamageevolution,TransientIsdamageevolutionEnum); femmodel->parameters->FindParam(&ishydrology,TransientIshydrologyEnum); femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum); - femmodel->parameters->FindParam(&ismovingfront,TransientIsmovingfrontEnum); if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum); femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum); @@ -104,5 +103,5 @@ if(isdamageevolution) damage_core(femmodel); - if(islevelset) movingfront_core(femmodel); + if(ismovingfront) movingfront_core(femmodel); /* from here on, prepare geometry for next time step*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 20459) @@ -80,5 +80,4 @@ parameters->AddObject(iomodel->CopyConstantObject(TransientIsgroundinglineEnum)); parameters->AddObject(iomodel->CopyConstantObject(TransientIsgiaEnum)); - parameters->AddObject(iomodel->CopyConstantObject(TransientIslevelsetEnum)); parameters->AddObject(iomodel->CopyConstantObject(TransientIsdamageevolutionEnum)); parameters->AddObject(iomodel->CopyConstantObject(TransientIshydrologyEnum)); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 20458) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 20459) @@ -1043,5 +1043,4 @@ /*}}}*/ /*Levelset related enums (will be moved to appropriate place when finished){{{*/ - TransientIslevelsetEnum, SpcLevelsetEnum, ExtrapolationVariableEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 20459) @@ -997,5 +997,4 @@ case ArrheniusEnum : return "Arrhenius"; case LliboutryDuvalEnum : return "LliboutryDuval"; - case TransientIslevelsetEnum : return "TransientIslevelset"; case SpcLevelsetEnum : return "SpcLevelset"; case ExtrapolationVariableEnum : return "ExtrapolationVariable"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 20458) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 20459) @@ -1021,5 +1021,4 @@ else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum; - else if (strcmp(name,"TransientIslevelset")==0) return TransientIslevelsetEnum; else if (strcmp(name,"SpcLevelset")==0) return SpcLevelsetEnum; else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum; Index: sm/trunk-jpl/src/m/classes/calvingpi.m =================================================================== --- /issm/trunk-jpl/src/m/classes/calvingpi.m (revision 20458) +++ (revision ) @@ -1,71 +1,0 @@ -%CALVINGPI class definition -% -% Usage: -% calvingpi=calvingpi(); - -classdef calvingpi - properties (SetAccess=public) - stabilization = 0; - spclevelset = NaN; - coeff = NaN; - meltingrate = NaN; - end - methods - function self = calvingpi(varargin) % {{{ - switch nargin - case 0 - self=setdefaultparameters(self); - case 1 - inputstruct=varargin{1}; - list1 = properties('calvingpi'); - list2 = fieldnames(inputstruct); - for i=1:length(list1) - fieldname = list1{i}; - if ismember(fieldname,list2), - self.(fieldname) = inputstruct.(fieldname); - end - end - otherwise - error('constructor not supported'); - end - end % }}} - function self = extrude(self,md) % {{{ - self.spclevelset=project3d(md,'vector',self.spclevelset,'type','node'); - self.coeff=project3d(md,'vector',self.coeff,'type','node'); - self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node'); - end % }}} - function self = setdefaultparameters(self) % {{{ - - %stabilization = 2 by default - self.stabilization = 2; - - %Proportionality coefficient in Pi model - self.coeff=2e13; - end % }}} - function md = checkconsistency(self,md,solution,analyses) % {{{ - %Early return - if (solution~=TransientSolutionEnum() | md.transient.ismovingfront==0), return; end - - md = checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1); - md = checkfield(md,'fieldname','calving.stabilization','values',[0 1 2]); - md = checkfield(md,'fieldname','calving.coeff','>',0,'size',[md.mesh.numberofvertices 1]); - md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>=',0); - end % }}} - function disp(self) % {{{ - disp(sprintf(' Calving Pi parameters:')); - fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding'); - fielddisplay(self,'spclevelset','Levelset constraints (NaN means no constraint)'); - fielddisplay(self,'coeff','proportionality coefficient in Pi model'); - fielddisplay(self,'meltingrate','melting rate at given location [m/a]'); - - end % }}} - function marshall(self,md,fid) % {{{ - yts=365.0*24.0*3600.0; - WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingPiEnum(),'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',CalvingpiCoeffEnum(),'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); - end % }}} - end -end Index: /issm/trunk-jpl/src/m/classes/trans.js =================================================================== --- /issm/trunk-jpl/src/m/classes/trans.js (revision 20458) +++ /issm/trunk-jpl/src/m/classes/trans.js (revision 20459) @@ -16,5 +16,4 @@ this.isgia = 0; this.isdamageevolution = 0; - this.islevelset = 0; this.ismovingfront = 0; this.ishydrology = 0; @@ -37,5 +36,4 @@ fielddisplay(this,'isgia','indicates whether a postglacial rebound model is used in the transient'); fielddisplay(this,'isdamageevolution','indicates whether damage evolution is used in the transient'); - fielddisplay(this,'islevelset','LEVEL SET DESCRIPTION...'); fielddisplay(this,'ismovingfront','indicates whether a moving front capability is used in the transient'); fielddisplay(this,'ishydrology','indicates whether an hydrology model is used'); @@ -61,5 +59,4 @@ checkfield(md,'fieldname','trans.isgia','numel',[1],'values',[0, 1]); checkfield(md,'fieldname','trans.isdamageevolution','numel',[1],'values',[0, 1]); - checkfield(md,'fieldname','trans.islevelset','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]); @@ -77,5 +74,4 @@ WriteData(fid,'object',this,'fieldname','isdamageevolution','format','Boolean'); WriteData(fid,'object',this,'fieldname','ishydrology','format','Boolean'); - WriteData(fid,'object',this,'fieldname','islevelset','format','Boolean'); WriteData(fid,'object',this,'fieldname','ismovingfront','format','Boolean'); WriteData(fid,'object',this,'fieldname','isslr','format','Boolean'); @@ -109,5 +105,4 @@ this.isgia = 0; this.isdamageevolution = 0; - this.islevelset = 0; this.ismovingfront = 0; this.ishydrology = 0; Index: /issm/trunk-jpl/src/m/classes/transient.m =================================================================== --- /issm/trunk-jpl/src/m/classes/transient.m (revision 20458) +++ /issm/trunk-jpl/src/m/classes/transient.m (revision 20459) @@ -13,5 +13,4 @@ isgia = 0; isdamageevolution = 0; - islevelset = 0; ismovingfront = 0; ishydrology = 0; @@ -39,5 +38,4 @@ self.isgia = 0; self.isdamageevolution = 0; - self.islevelset = 0; self.ismovingfront =0; self.ishydrology = 0; @@ -58,5 +56,4 @@ self.isgia = 0; self.isdamageevolution = 0; - self.islevelset = 0; self.ismovingfront = 0; self.ishydrology = 0; @@ -86,5 +83,4 @@ md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0 1]); 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.ismovingfront','numel',[1],'values',[0 1]); md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 1]); @@ -104,5 +100,4 @@ fielddisplay(self,'isgia','indicates whether a postglacial rebound model is used in the transient'); fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient'); - fielddisplay(self,'islevelset','LEVEL SET DESCRIPTION...'); fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient'); fielddisplay(self,'ishydrology','indicates whether an hydrology model is used'); @@ -121,5 +116,4 @@ WriteData(fid,'object',self,'fieldname','isdamageevolution','format','Boolean'); WriteData(fid,'object',self,'fieldname','ishydrology','format','Boolean'); - WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean'); WriteData(fid,'object',self,'fieldname','ismovingfront','format','Boolean'); WriteData(fid,'object',self,'fieldname','isslr','format','Boolean'); @@ -144,5 +138,4 @@ writejsdouble(fid,[modelname '.trans.isgia'],self.isgia); writejsdouble(fid,[modelname '.trans.isdamageevolution'],self.isdamageevolution); - writejsdouble(fid,[modelname '.trans.islevelset'],self.islevelset); writejsdouble(fid,[modelname '.trans.ismovingfront'],self.ismovingfront); writejsdouble(fid,[modelname '.trans.ishydrology'],self.ishydrology); Index: /issm/trunk-jpl/src/m/classes/transient.py =================================================================== --- /issm/trunk-jpl/src/m/classes/transient.py (revision 20458) +++ /issm/trunk-jpl/src/m/classes/transient.py (revision 20459) @@ -20,5 +20,4 @@ self.isgia = False self.isdamageevolution = False - self.islevelset = False self.ismovingfront = False self.ishydrology = False @@ -40,5 +39,4 @@ string="%s\n%s"%(string,fielddisplay(self,'isgia','indicates if a postglacial rebound is used in the transient')) 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,'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')) @@ -66,5 +64,4 @@ self.isgia = False self.isdamageevolution = False - self.islevelset = False self.ismovingfront = False self.ishydrology = False @@ -86,5 +83,4 @@ self.isgia = False self.isdamageevolution = False - self.islevelset = False self.ismovingfront = False self.ishydrology = False @@ -109,5 +105,4 @@ md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0,1]) 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.ishydrology','numel',[1],'values',[0,1]) md = checkfield(md,'fieldname','transient.ismovingfront','numel',[1],'values',[0,1]); @@ -126,5 +121,4 @@ WriteData(fid,'object',self,'fieldname','isgia','format','Boolean') WriteData(fid,'object',self,'fieldname','isdamageevolution','format','Boolean') - WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean') WriteData(fid,'object',self,'fieldname','ishydrology','format','Boolean') WriteData(fid,'object',self,'fieldname','ismovingfront','format','Boolean') Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.js =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.js (revision 20458) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.js (revision 20459) @@ -982,30 +982,29 @@ function ArrheniusEnum(){ return 978;} function LliboutryDuvalEnum(){ return 979;} -function TransientIslevelsetEnum(){ return 980;} -function SpcLevelsetEnum(){ return 981;} -function ExtrapolationVariableEnum(){ return 982;} -function IceMaskNodeActivationEnum(){ return 983;} -function LevelsetfunctionSlopeXEnum(){ return 984;} -function LevelsetfunctionSlopeYEnum(){ return 985;} -function LevelsetfunctionPicardEnum(){ return 986;} -function SealevelriseSolutionEnum(){ return 987;} -function SealevelriseAnalysisEnum(){ return 988;} -function SealevelEnum(){ return 989;} -function SealevelEustaticEnum(){ return 990;} -function SealevelriseDeltathicknessEnum(){ return 991;} -function SealevelriseMaxiterEnum(){ return 992;} -function SealevelriseReltolEnum(){ return 993;} -function SealevelriseAbstolEnum(){ return 994;} -function SealevelriseLoveHEnum(){ return 995;} -function SealevelriseLoveKEnum(){ return 996;} -function SealevelriseTideLoveHEnum(){ return 997;} -function SealevelriseTideLoveKEnum(){ return 998;} -function SealevelriseRigidEnum(){ return 999;} -function SealevelriseElasticEnum(){ return 1000;} -function SealevelriseRotationEnum(){ return 1001;} -function SealevelriseGElasticEnum(){ return 1002;} -function SealevelriseDegaccEnum(){ return 1003;} -function SealevelriseTransitionsEnum(){ return 1004;} -function SealevelriseRequestedOutputsEnum(){ return 1005;} -function SealevelriseNumRequestedOutputsEnum(){ return 1006;} -function MaximumNumberOfDefinitionsEnum(){ return 1007;} +function SpcLevelsetEnum(){ return 980;} +function ExtrapolationVariableEnum(){ return 981;} +function IceMaskNodeActivationEnum(){ return 982;} +function LevelsetfunctionSlopeXEnum(){ return 983;} +function LevelsetfunctionSlopeYEnum(){ return 984;} +function LevelsetfunctionPicardEnum(){ return 985;} +function SealevelriseSolutionEnum(){ return 986;} +function SealevelriseAnalysisEnum(){ return 987;} +function SealevelEnum(){ return 988;} +function SealevelEustaticEnum(){ return 989;} +function SealevelriseDeltathicknessEnum(){ return 990;} +function SealevelriseMaxiterEnum(){ return 991;} +function SealevelriseReltolEnum(){ return 992;} +function SealevelriseAbstolEnum(){ return 993;} +function SealevelriseLoveHEnum(){ return 994;} +function SealevelriseLoveKEnum(){ return 995;} +function SealevelriseTideLoveHEnum(){ return 996;} +function SealevelriseTideLoveKEnum(){ return 997;} +function SealevelriseRigidEnum(){ return 998;} +function SealevelriseElasticEnum(){ return 999;} +function SealevelriseRotationEnum(){ return 1000;} +function SealevelriseGElasticEnum(){ return 1001;} +function SealevelriseDegaccEnum(){ return 1002;} +function SealevelriseTransitionsEnum(){ return 1003;} +function SealevelriseRequestedOutputsEnum(){ return 1004;} +function SealevelriseNumRequestedOutputsEnum(){ return 1005;} +function MaximumNumberOfDefinitionsEnum(){ return 1006;} Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 20458) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 20459) @@ -989,5 +989,4 @@ 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 ExtrapolationVariableEnum(): return StringToEnum("ExtrapolationVariable")[0] Index: /issm/trunk-jpl/test/NightlyRun/test801.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test801.m (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test801.m (revision 20459) @@ -8,5 +8,4 @@ %Transient; md.transient.isstressbalance=1; -md.transient.islevelset=1; md.transient.ismovingfront=1; md.transient.ismasstransport=1; Index: /issm/trunk-jpl/test/NightlyRun/test801.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test801.py (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test801.py (revision 20459) @@ -18,5 +18,4 @@ #Transient md.transient.isstressbalance=True -md.transient.islevelset=True md.transient.ismovingfront=True md.transient.ismasstransport=True Index: /issm/trunk-jpl/test/NightlyRun/test802.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test802.m (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test802.m (revision 20459) @@ -13,5 +13,4 @@ %Transient md.transient.isstressbalance=1; -md.transient.islevelset=1; md.transient.ismovingfront=1; md.transient.ismasstransport=1; Index: /issm/trunk-jpl/test/NightlyRun/test802.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test802.py (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test802.py (revision 20459) @@ -23,5 +23,4 @@ #Transient md.transient.isstressbalance=True -md.transient.islevelset=True md.transient.ismovingfront=True md.transient.ismasstransport=True Index: /issm/trunk-jpl/test/NightlyRun/test803.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test803.m (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test803.m (revision 20459) @@ -15,5 +15,4 @@ %Transient md.transient.isstressbalance=1; -md.transient.islevelset=1; md.transient.ismovingfront=1; md.transient.ismasstransport=1; Index: /issm/trunk-jpl/test/NightlyRun/test803.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test803.py (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test803.py (revision 20459) @@ -25,5 +25,4 @@ #Transient md.transient.isstressbalance=True -md.transient.islevelset=True md.transient.ismovingfront=True md.transient.ismasstransport=True Index: /issm/trunk-jpl/test/NightlyRun/test804.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test804.m (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test804.m (revision 20459) @@ -8,5 +8,4 @@ %Transient md.transient.isstressbalance=1; -md.transient.islevelset=1; md.transient.ismasstransport=1; md.transient.issmb=1; Index: /issm/trunk-jpl/test/NightlyRun/test804.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test804.py (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test804.py (revision 20459) @@ -18,5 +18,4 @@ #Transient md.transient.isstressbalance=True -md.transient.islevelset=True md.transient.ismasstransport=True md.transient.issmb=True Index: /issm/trunk-jpl/test/NightlyRun/test805.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test805.m (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test805.m (revision 20459) @@ -15,5 +15,4 @@ %Transient md.transient.isstressbalance=1; -md.transient.islevelset=1; md.transient.ismasstransport=1; md.transient.issmb=1; Index: /issm/trunk-jpl/test/NightlyRun/test805.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test805.py (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test805.py (revision 20459) @@ -25,5 +25,4 @@ #Transient md.transient.isstressbalance=True -md.transient.islevelset=True md.transient.ismasstransport=True md.transient.issmb=True Index: /issm/trunk-jpl/test/NightlyRun/test806.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test806.m (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test806.m (revision 20459) @@ -18,5 +18,4 @@ %Transient md.transient.isstressbalance=1; -md.transient.islevelset=1; md.transient.ismasstransport=1; md.transient.issmb=1; Index: /issm/trunk-jpl/test/NightlyRun/test806.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test806.py (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test806.py (revision 20459) @@ -29,5 +29,4 @@ #Transient md.transient.isstressbalance=True -md.transient.islevelset=True md.transient.ismasstransport=True md.transient.issmb=True Index: /issm/trunk-jpl/test/NightlyRun/test807.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test807.m (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test807.m (revision 20459) @@ -18,5 +18,4 @@ %Transient md.transient.isstressbalance=1; -md.transient.islevelset=1; md.transient.ismasstransport=1; md.transient.issmb=1; Index: /issm/trunk-jpl/test/NightlyRun/test807.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test807.py (revision 20458) +++ /issm/trunk-jpl/test/NightlyRun/test807.py (revision 20459) @@ -29,5 +29,4 @@ #Transient md.transient.isstressbalance=True -md.transient.islevelset=True md.transient.ismasstransport=True md.transient.issmb=True Index: /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par =================================================================== --- /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par (revision 20458) +++ /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par (revision 20459) @@ -61,5 +61,5 @@ %Transient md.transient.isstressbalance = 1; -md.transient.islevelset = 1; +md.transient.ismovingfront = 1; md.transient.ismasstransport = 0; md.transient.isthermal = 0; Index: /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py (revision 20458) +++ /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py (revision 20459) @@ -68,5 +68,5 @@ #Transient md.transient.isstressbalance=True -md.transient.islevelset=True +md.transient.ismovingfront=True md.transient.ismasstransport=False md.transient.isthermal=False