Index: /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 22575) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 22576) @@ -621,10 +621,4 @@ } - /*Now, we have to move the previous Vx and Vy inputs to old - * status, otherwise, we'll wipe them off: */ - element->InputChangeName(VxEnum,VxPicardEnum); - element->InputChangeName(VyEnum,VyPicardEnum); - element->InputChangeName(PressureEnum,PressurePicardEnum); - /*Add vx and vy as inputs to the tria element: */ element->AddInput(VxEnum,vx,P1Enum); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 22575) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 22576) @@ -567,11 +567,5 @@ for(i=0;iInputChangeName(VzEnum,VzPicardEnum); - if(approximation!=HOFSApproximationEnum && approximation!=SSAFSApproximationEnum){ - element->InputChangeName(PressureEnum,PressurePicardEnum); element->AddInput(PressureEnum,pressure,element->GetElementType()); } Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 22575) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 22576) @@ -1995,6 +1995,4 @@ name==LoadingforceYEnum || name==VelEnum || - name==VxPicardEnum || - name==VyPicardEnum || name==DeviatoricStressxxEnum || name==DeviatoricStressyyEnum || Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22575) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22576) @@ -550,5 +550,4 @@ MisfitEnum, PressureEnum, - PressurePicardEnum, AndroidFrictionCoefficientEnum, ResetPenaltiesEnum, @@ -573,12 +572,9 @@ VxAverageEnum, VxEnum, - VxPicardEnum, VyAverageEnum, VyEnum, - VyPicardEnum, VzEnum, VzSSAEnum, VzHOEnum, - VzPicardEnum, VzFSEnum, VxMeshEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22575) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22576) @@ -548,5 +548,4 @@ case MisfitEnum : return "Misfit"; case PressureEnum : return "Pressure"; - case PressurePicardEnum : return "PressurePicard"; case AndroidFrictionCoefficientEnum : return "AndroidFrictionCoefficient"; case ResetPenaltiesEnum : return "ResetPenalties"; @@ -571,12 +570,9 @@ case VxAverageEnum : return "VxAverage"; case VxEnum : return "Vx"; - case VxPicardEnum : return "VxPicard"; case VyAverageEnum : return "VyAverage"; case VyEnum : return "Vy"; - case VyPicardEnum : return "VyPicard"; case VzEnum : return "Vz"; case VzSSAEnum : return "VzSSA"; case VzHOEnum : return "VzHO"; - case VzPicardEnum : return "VzPicard"; case VzFSEnum : return "VzFS"; case VxMeshEnum : return "VxMesh"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22575) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22576) @@ -560,5 +560,4 @@ else if (strcmp(name,"Misfit")==0) return MisfitEnum; else if (strcmp(name,"Pressure")==0) return PressureEnum; - else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum; else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum; @@ -583,12 +582,9 @@ else if (strcmp(name,"VxAverage")==0) return VxAverageEnum; else if (strcmp(name,"Vx")==0) return VxEnum; - else if (strcmp(name,"VxPicard")==0) return VxPicardEnum; else if (strcmp(name,"VyAverage")==0) return VyAverageEnum; else if (strcmp(name,"Vy")==0) return VyEnum; - else if (strcmp(name,"VyPicard")==0) return VyPicardEnum; else if (strcmp(name,"Vz")==0) return VzEnum; else if (strcmp(name,"VzSSA")==0) return VzSSAEnum; else if (strcmp(name,"VzHO")==0) return VzHOEnum; - else if (strcmp(name,"VzPicard")==0) return VzPicardEnum; else if (strcmp(name,"VzFS")==0) return VzFSEnum; else if (strcmp(name,"VxMesh")==0) return VxMeshEnum; @@ -629,12 +625,12 @@ else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum; else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum; + else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; + else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; + else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum; + else if (strcmp(name,"LambdaS")==0) return LambdaSEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; - else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; - else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum; - else if (strcmp(name,"LambdaS")==0) return LambdaSEnum; - else if (strcmp(name,"StrainRate")==0) return StrainRateEnum; + if (strcmp(name,"StrainRate")==0) return StrainRateEnum; else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum; else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum; @@ -752,12 +748,12 @@ else if (strcmp(name,"Outputdefinition89")==0) return Outputdefinition89Enum; else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum; + else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum; + else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum; + else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum; + else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum; else stage=7; } if(stage==7){ - if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum; - else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum; - else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum; - else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum; - else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum; + if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum; else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum; else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum; @@ -875,12 +871,12 @@ else if (strcmp(name,"SealevelriseTransitions")==0) return SealevelriseTransitionsEnum; else if (strcmp(name,"SealevelriseRequestedOutputs")==0) return SealevelriseRequestedOutputsEnum; + else if (strcmp(name,"SealevelriseNumRequestedOutputs")==0) return SealevelriseNumRequestedOutputsEnum; + else if (strcmp(name,"LoveNfreq")==0) return LoveNfreqEnum; + else if (strcmp(name,"LoveFrequencies")==0) return LoveFrequenciesEnum; + else if (strcmp(name,"LoveShNmax")==0) return LoveShNmaxEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"SealevelriseNumRequestedOutputs")==0) return SealevelriseNumRequestedOutputsEnum; - else if (strcmp(name,"LoveNfreq")==0) return LoveNfreqEnum; - else if (strcmp(name,"LoveFrequencies")==0) return LoveFrequenciesEnum; - else if (strcmp(name,"LoveShNmax")==0) return LoveShNmaxEnum; - else if (strcmp(name,"LoveShNmin")==0) return LoveShNminEnum; + if (strcmp(name,"LoveShNmin")==0) return LoveShNminEnum; else if (strcmp(name,"LoveG0")==0) return LoveG0Enum; else if (strcmp(name,"LoveR0")==0) return LoveR0Enum; @@ -998,12 +994,12 @@ else if (strcmp(name,"SegInput")==0) return SegInputEnum; else if (strcmp(name,"Tria")==0) return TriaEnum; + else if (strcmp(name,"TriaInput")==0) return TriaInputEnum; + else if (strcmp(name,"Tetra")==0) return TetraEnum; + else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; + else if (strcmp(name,"Penta")==0) return PentaEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"TriaInput")==0) return TriaInputEnum; - else if (strcmp(name,"Tetra")==0) return TetraEnum; - else if (strcmp(name,"TetraInput")==0) return TetraInputEnum; - else if (strcmp(name,"Penta")==0) return PentaEnum; - else if (strcmp(name,"PentaInput")==0) return PentaInputEnum; + if (strcmp(name,"PentaInput")==0) return PentaInputEnum; else if (strcmp(name,"Vertex")==0) return VertexEnum; else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum; @@ -1121,12 +1117,12 @@ else if (strcmp(name,"P1xP2")==0) return P1xP2Enum; else if (strcmp(name,"P1xP3")==0) return P1xP3Enum; + else if (strcmp(name,"P1xP4")==0) return P1xP4Enum; + else if (strcmp(name,"P2xP4")==0) return P2xP4Enum; + else if (strcmp(name,"P1P1")==0) return P1P1Enum; + else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; else stage=10; } if(stage==10){ - if (strcmp(name,"P1xP4")==0) return P1xP4Enum; - else if (strcmp(name,"P2xP4")==0) return P2xP4Enum; - else if (strcmp(name,"P1P1")==0) return P1P1Enum; - else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; - else if (strcmp(name,"MINI")==0) return MINIEnum; + if (strcmp(name,"MINI")==0) return MINIEnum; else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum; else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum; Index: /issm/trunk-jpl/src/m/classes/snowpack.m =================================================================== --- /issm/trunk-jpl/src/m/classes/snowpack.m (revision 22575) +++ /issm/trunk-jpl/src/m/classes/snowpack.m (revision 22576) @@ -463,5 +463,4 @@ WriteData(fid,prefix,'object',self,'class','snowpack','fieldname','isnewton','format','Integer'); WriteData(fid,prefix,'object',self,'class','snowpack','fieldname','FSreconditioning','format','Double'); - WriteData(fid,prefix,'object',self,'class','snowpack','fieldname','viscosity_overshoot','format','Double'); WriteData(fid,prefix,'object',self,'class','snowpack','fieldname','maxiter','format','Integer'); WriteData(fid,prefix,'object',self,'class','snowpack','fieldname','shelf_dampening','format','Integer'); Index: /issm/trunk-jpl/src/m/classes/stressbalance.js =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.js (revision 22575) +++ /issm/trunk-jpl/src/m/classes/stressbalance.js (revision 22576) @@ -21,9 +21,4 @@ //Penalty factor applied kappa=max(stiffness matrix)*10^penalty_factor this.penalty_factor=3; - - //coefficient to update the viscosity between each iteration of - //a stressbalance according to the following formula - //viscosity(n)=viscosity(n)+viscosity_overshoot(viscosity(n)-viscosity(n-1)) - this.viscosity_overshoot=0; //Stop the iterations of rift if below a threshold @@ -48,5 +43,4 @@ fielddisplay(this,'isnewton',"0: Picard's fixed point, 1: Newton's method, 2: hybrid"); fielddisplay(this,'maxiter','maximum number of nonlinear iterations'); - fielddisplay(this,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)'); console.log(sprintf('\n %s','boundary conditions:')); @@ -97,5 +91,4 @@ checkfield(md,'fieldname','stressbalance.isnewton','numel',[1],'values',[0, 1, 2]); checkfield(md,'fieldname','stressbalance.FSreconditioning','size',[1, 1],'NaN',1,'Inf',1); - checkfield(md,'fieldname','stressbalance.viscosity_overshoot','size',[1, 1],'NaN',1,'Inf',1); checkfield(md,'fieldname','stressbalance.maxiter','size',[1, 1],'>=',1); checkfield(md,'fieldname','stressbalance.referential','size',[md.mesh.numberofvertices, 6]); @@ -158,5 +151,4 @@ WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','isnewton','format','Integer'); WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','FSreconditioning','format','Double'); - WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','viscosity_overshoot','format','Double'); WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','maxiter','format','Integer'); WriteData(fid,prefix,'object',this,'class','stressbalance','fieldname','shelf_dampening','format','Integer'); @@ -214,5 +206,4 @@ this.isnewton = 0; this.FSreconditioning = 0; - this.viscosity_overshoot = 0; this.maxiter = 0; this.shelf_dampening = 0; Index: /issm/trunk-jpl/src/m/classes/stressbalance.m =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.m (revision 22575) +++ /issm/trunk-jpl/src/m/classes/stressbalance.m (revision 22576) @@ -14,5 +14,4 @@ isnewton = 0; FSreconditioning = 0; - viscosity_overshoot = 0; maxiter = 0; shelf_dampening = 0; @@ -68,9 +67,4 @@ self.penalty_factor=3; - %coefficient to update the viscosity between each iteration of - %a stressbalance according to the following formula - %viscosity(n)=viscosity(n)+viscosity_overshoot(viscosity(n)-viscosity(n-1)) - self.viscosity_overshoot=0; - %Stop the iterations of rift if below a threshold self.rift_penalty_threshold=0; @@ -99,5 +93,4 @@ md = checkfield(md,'fieldname','stressbalance.isnewton','numel',[1],'values',[0 1 2]); md = checkfield(md,'fieldname','stressbalance.FSreconditioning','size',[1 1],'NaN',1,'Inf',1); - md = checkfield(md,'fieldname','stressbalance.viscosity_overshoot','size',[1 1],'NaN',1,'Inf',1); md = checkfield(md,'fieldname','stressbalance.maxiter','size',[1 1],'>=',1); md = checkfield(md,'fieldname','stressbalance.referential','size',[md.mesh.numberofvertices 6]); @@ -150,5 +143,4 @@ fielddisplay(self,'isnewton','0: Picard''s fixed point, 1: Newton''s method, 2: hybrid'); fielddisplay(self,'maxiter','maximum number of nonlinear iterations'); - fielddisplay(self,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)'); disp(sprintf('\n %s','boundary conditions:')); @@ -187,5 +179,4 @@ WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','isnewton','format','Integer'); WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','FSreconditioning','format','Double'); - WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','viscosity_overshoot','format','Double'); WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','maxiter','format','Integer'); WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','shelf_dampening','format','Integer'); @@ -220,5 +211,4 @@ writejsdouble(fid,[modelname '.stressbalance.isnewton'],self.isnewton); writejsdouble(fid,[modelname '.stressbalance.FSreconditioning'],self.FSreconditioning); - writejsdouble(fid,[modelname '.stressbalance.viscosity_overshoot'],self.viscosity_overshoot); writejsdouble(fid,[modelname '.stressbalance.maxiter'],self.maxiter); writejsdouble(fid,[modelname '.stressbalance.shelf_dampening'],self.shelf_dampening); Index: /issm/trunk-jpl/src/m/classes/stressbalance.py =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.py (revision 22575) +++ /issm/trunk-jpl/src/m/classes/stressbalance.py (revision 22576) @@ -17,23 +17,22 @@ def __init__(self): # {{{ - self.spcvx = float('NaN') - self.spcvy = float('NaN') - self.spcvz = float('NaN') - self.restol = 0 - self.reltol = 0 - self.abstol = 0 - self.isnewton = 0 - self.FSreconditioning = 0 - self.viscosity_overshoot = 0 - self.icefront = float('NaN') - self.maxiter = 0 - self.shelf_dampening = 0 - self.vertex_pairing = float('NaN') - self.penalty_factor = float('NaN') - self.rift_penalty_lock = float('NaN') - self.rift_penalty_threshold = 0 - self.referential = float('NaN') - self.loadingforce = float('NaN') - self.requested_outputs = [] + self.spcvx = float('NaN') + self.spcvy = float('NaN') + self.spcvz = float('NaN') + self.restol = 0 + self.reltol = 0 + self.abstol = 0 + self.isnewton = 0 + self.FSreconditioning = 0 + self.icefront = float('NaN') + self.maxiter = 0 + self.shelf_dampening = 0 + self.vertex_pairing = float('NaN') + self.penalty_factor = float('NaN') + self.rift_penalty_lock = float('NaN') + self.rift_penalty_threshold = 0 + self.referential = float('NaN') + self.loadingforce = float('NaN') + self.requested_outputs = [] #set defaults @@ -50,5 +49,4 @@ string="%s\n%s"%(string,fielddisplay(self,'isnewton',"0: Picard's fixed point, 1: Newton's method, 2: hybrid")) string="%s\n%s"%(string,fielddisplay(self,'maxiter','maximum number of nonlinear iterations')) - string="%s\n%s"%(string,fielddisplay(self,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)')) string="%s\n%s"%(string,'\n boundary conditions:') @@ -98,9 +96,4 @@ #Penalty factor applied kappa=max(stiffness matrix)*10^penalty_factor self.penalty_factor=3 - - #coefficient to update the viscosity between each iteration of - #a stressbalance according to the following formula - #viscosity(n)=viscosity(n)+viscosity_overshoot(viscosity(n)-viscosity(n-1)) - self.viscosity_overshoot=0 #Stop the iterations of rift if below a threshold @@ -141,5 +134,4 @@ md = checkfield(md,'fieldname','stressbalance.isnewton','numel',[1],'values',[0,1,2]) md = checkfield(md,'fieldname','stressbalance.FSreconditioning','size',[1],'NaN',1,'Inf',1) - md = checkfield(md,'fieldname','stressbalance.viscosity_overshoot','size',[1],'NaN',1,'Inf',1) md = checkfield(md,'fieldname','stressbalance.maxiter','size',[1],'>=',1) md = checkfield(md,'fieldname','stressbalance.referential','size',[md.mesh.numberofvertices,6]) @@ -187,5 +179,4 @@ WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','isnewton','format','Integer') WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','FSreconditioning','format','Double') - WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','viscosity_overshoot','format','Double') WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','maxiter','format','Integer') WriteData(fid,prefix,'object',self,'class','stressbalance','fieldname','shelf_dampening','format','Integer') Index: /issm/trunk-jpl/src/py3/classes/stressbalance.py =================================================================== --- /issm/trunk-jpl/src/py3/classes/stressbalance.py (revision 22575) +++ /issm/trunk-jpl/src/py3/classes/stressbalance.py (revision 22576) @@ -18,23 +18,22 @@ def __init__(self): # {{{ - self.spcvx = float('NaN') - self.spcvy = float('NaN') - self.spcvz = float('NaN') - self.restol = 0 - self.reltol = 0 - self.abstol = 0 - self.isnewton = 0 - self.FSreconditioning = 0 - self.viscosity_overshoot = 0 - self.icefront = float('NaN') - self.maxiter = 0 - self.shelf_dampening = 0 - self.vertex_pairing = float('NaN') - self.penalty_factor = float('NaN') - self.rift_penalty_lock = float('NaN') - self.rift_penalty_threshold = 0 - self.referential = float('NaN') - self.loadingforce = float('NaN') - self.requested_outputs = [] + self.spcvx = float('NaN') + self.spcvy = float('NaN') + self.spcvz = float('NaN') + self.restol = 0 + self.reltol = 0 + self.abstol = 0 + self.isnewton = 0 + self.FSreconditioning = 0 + self.icefront = float('NaN') + self.maxiter = 0 + self.shelf_dampening = 0 + self.vertex_pairing = float('NaN') + self.penalty_factor = float('NaN') + self.rift_penalty_lock = float('NaN') + self.rift_penalty_threshold = 0 + self.referential = float('NaN') + self.loadingforce = float('NaN') + self.requested_outputs = [] #set defaults @@ -51,5 +50,4 @@ string="%s\n%s"%(string,fielddisplay(self,'isnewton',"0: Picard's fixed point, 1: Newton's method, 2: hybrid")) string="%s\n%s"%(string,fielddisplay(self,'maxiter','maximum number of nonlinear iterations')) - string="%s\n%s"%(string,fielddisplay(self,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)')) string="%s\n%s"%(string,'\n boundary conditions:') @@ -100,9 +98,4 @@ self.penalty_factor=3 - #coefficient to update the viscosity between each iteration of - #a stressbalance according to the following formula - #viscosity(n)=viscosity(n)+viscosity_overshoot(viscosity(n)-viscosity(n-1)) - self.viscosity_overshoot=0 - #Stop the iterations of rift if below a threshold self.rift_penalty_threshold=0 @@ -142,5 +135,4 @@ md = checkfield(md,'fieldname','stressbalance.isnewton','numel',[1],'values',[0,1,2]) md = checkfield(md,'fieldname','stressbalance.FSreconditioning','size',[1],'NaN',1,'Inf',1) - md = checkfield(md,'fieldname','stressbalance.viscosity_overshoot','size',[1],'NaN',1,'Inf',1) md = checkfield(md,'fieldname','stressbalance.maxiter','size',[1],'>=',1) md = checkfield(md,'fieldname','stressbalance.referential','size',[md.mesh.numberofvertices,6]) @@ -186,5 +178,4 @@ WriteData(fid,'object',self,'class','stressbalance','fieldname','isnewton','format','Integer') WriteData(fid,'object',self,'class','stressbalance','fieldname','FSreconditioning','format','Double') - WriteData(fid,'object',self,'class','stressbalance','fieldname','viscosity_overshoot','format','Double') WriteData(fid,'object',self,'class','stressbalance','fieldname','maxiter','format','Integer') WriteData(fid,'object',self,'class','stressbalance','fieldname','shelf_dampening','format','Integer') Index: /issm/trunk-jpl/src/py3/modifier.sh =================================================================== --- /issm/trunk-jpl/src/py3/modifier.sh (revision 22575) +++ /issm/trunk-jpl/src/py3/modifier.sh (revision 22576) @@ -260,5 +260,4 @@ sed -i 's/(md,'fieldname','stressbalance.isnewton','numel',[1],'values',[0,1,2])/(md,fieldname='stressbalance.isnewton',numel=[1],values=[0,1,2])/g' ./classes/stressbalance.py: sed -i 's/(md,'fieldname','stressbalance.FSreconditioning',size=[1],'NaN',1)/(md,fieldname='stressbalance.FSreconditioning','size',[1],NaN=1)/g' ./classes/stressbalance.py: -sed -i 's/(md,'fieldname','stressbalance.viscosity_overshoot',size=[1],'NaN',1)/(md,fieldname='stressbalance.viscosity_overshoot','size',[1],NaN=1)/g' ./classes/stressbalance.py: sed -i 's/(md,'fieldname','stressbalance.maxiter',size=[1],'>=',1)/(md,fieldname='stressbalance.maxiter','size',[1],ge=1)/g' ./classes/stressbalance.py: sed -i 's/(md,'fieldname','stressbalance.referential',size=[md.mesh.numberofvertices,6])/(md,fieldname='stressbalance.referential','size',[md.mesh.numberofvertices,6])/g' ./classes/stressbalance.py: