Index: /issm/trunk-jpl/src/c/analyses/UzawaPressureAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/UzawaPressureAnalysis.cpp (revision 18207) +++ /issm/trunk-jpl/src/c/analyses/UzawaPressureAnalysis.cpp (revision 18208) @@ -11,5 +11,5 @@ void UzawaPressureAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/ - parameters->AddObject(iomodel->CopyConstantObject(AugmentedLagrangianREnum)); + parameters->AddObject(iomodel->CopyConstantObject(AugmentedLagrangianRhopEnum)); }/*}}}*/ void UzawaPressureAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/ @@ -91,5 +91,5 @@ /*Intermediaries*/ int dim; - IssmDouble Jdet,r,divu; + IssmDouble Jdet,rhop,divu; IssmDouble *xyz_list = NULL; int numnodes = element->GetNumberOfNodes(); @@ -97,5 +97,5 @@ /*Retrieve all inputs and parameters*/ element->FindParam(&dim,DomainDimensionEnum); - element->FindParam(&r,AugmentedLagrangianREnum); + element->FindParam(&rhop,AugmentedLagrangianRhopEnum); element->GetVerticesCoordinates(&xyz_list); @@ -128,5 +128,5 @@ for(int i=0;ivalues[i] += - r * divu * Jdet * gauss->weight * basis[i]; + pe->values[i] += - rhop * divu * Jdet * gauss->weight * basis[i]; } } Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18207) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18208) @@ -668,4 +668,5 @@ IncrementalEnum, AugmentedLagrangianREnum, + AugmentedLagrangianRhopEnum, AugmentedLagrangianThetaEnum, /*}}}*/ Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18207) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18208) @@ -649,4 +649,5 @@ case IncrementalEnum : return "Incremental"; case AugmentedLagrangianREnum : return "AugmentedLagrangianR"; + case AugmentedLagrangianRhopEnum : return "AugmentedLagrangianRhop"; case AugmentedLagrangianThetaEnum : return "AugmentedLagrangianTheta"; case NoneEnum : return "None"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18207) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18208) @@ -664,4 +664,5 @@ else if (strcmp(name,"Incremental")==0) return IncrementalEnum; else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum; + else if (strcmp(name,"AugmentedLagrangianRhop")==0) return AugmentedLagrangianRhopEnum; else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum; else if (strcmp(name,"None")==0) return NoneEnum; Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_la.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_la.cpp (revision 18207) +++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_la.cpp (revision 18208) @@ -34,5 +34,4 @@ femmodel->parameters->FindParam(&eps_rel,StressbalanceReltolEnum); femmodel->parameters->FindParam(&max_nonlinear_iterations,StressbalanceMaxiterEnum); - femmodel->parameters->FindParam(&r,AugmentedLagrangianREnum); /*Update constraints*/ Index: /issm/trunk-jpl/src/m/classes/flowequation.m =================================================================== --- /issm/trunk-jpl/src/m/classes/flowequation.m (revision 18207) +++ /issm/trunk-jpl/src/m/classes/flowequation.m (revision 18208) @@ -6,19 +6,20 @@ classdef flowequation properties (SetAccess=public) - isSIA = 0; - isSSA = 0; - isL1L2 = 0; - isHO = 0; - isFS = 0; - fe_SSA = ''; - fe_HO = ''; - fe_FS = ''; - augmented_lagrangian_r = 1.; - XTH_theta = 0.; - vertex_equation = NaN; - element_equation = NaN; - borderSSA = NaN; - borderHO = NaN; - borderFS = NaN; + isSIA = 0; + isSSA = 0; + isL1L2 = 0; + isHO = 0; + isFS = 0; + fe_SSA = ''; + fe_HO = ''; + fe_FS = ''; + augmented_lagrangian_r = 1.; + augmented_lagrangian_rhop = 1.; + XTH_theta = 0.; + vertex_equation = NaN; + element_equation = NaN; + borderSSA = NaN; + borderHO = NaN; + borderFS = NaN; end methods (Static) @@ -135,5 +136,6 @@ md = checkfield(md,'fieldname','flowequation.fe_HO' ,'values',{'P1','P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2','P2bubble','P1xP3','P2xP4'}); md = checkfield(md,'fieldname','flowequation.fe_FS' ,'values',{'P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood','LATaylorHood','XTaylorHood','OneLayerP4z','CrouzeixRaviart'}); - md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_r','numel',[1],'>=',0.); + md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_r','numel',[1],'>',0.); + md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_rhop','numel',[1],'>',0.); md = checkfield(md,'fieldname','flowequation.XTH_theta','numel',[1],'>=',0.,'<',0.5); md = checkfield(md,'fieldname','flowequation.borderSSA','size',[md.mesh.numberofvertices 1],'values',[0 1]); @@ -193,4 +195,5 @@ WriteData(fid,'enum',FlowequationFeFSEnum() ,'data',StringToEnum(obj.fe_FS) ,'format','Integer'); WriteData(fid,'enum',AugmentedLagrangianREnum(),'data',obj.augmented_lagrangian_r ,'format','Double'); + WriteData(fid,'enum',AugmentedLagrangianRhopEnum(),'data',obj.augmented_lagrangian_rhop ,'format','Double'); WriteData(fid,'enum',AugmentedLagrangianThetaEnum() ,'data',obj.XTH_theta ,'format','Double'); WriteData(fid,'object',obj,'fieldname','borderSSA','format','DoubleMat','mattype',1); Index: /issm/trunk-jpl/src/m/classes/flowequation.py =================================================================== --- /issm/trunk-jpl/src/m/classes/flowequation.py (revision 18207) +++ /issm/trunk-jpl/src/m/classes/flowequation.py (revision 18208) @@ -17,19 +17,20 @@ def __init__(self): # {{{ - self.isSIA = 0 - self.isSSA = 0 - self.isL1L2 = 0 - self.isHO = 0 - self.isFS = 0 - self.fe_SSA = '' - self.fe_HO = '' - self.fe_FS = '' - self.augmented_lagrangian_r = 1. - self.XTH_theta = 0. - self.vertex_equation = float('NaN') - self.element_equation = float('NaN') - self.borderSSA = float('NaN') - self.borderHO = float('NaN') - self.borderFS = float('NaN') + self.isSIA = 0 + self.isSSA = 0 + self.isL1L2 = 0 + self.isHO = 0 + self.isFS = 0 + self.fe_SSA = '' + self.fe_HO = '' + self.fe_FS = '' + self.augmented_lagrangian_r = 1. + self.augmented_lagrangian_rhop = 1. + self.XTH_theta = 0. + self.vertex_equation = float('NaN') + self.element_equation = float('NaN') + self.borderSSA = float('NaN') + self.borderHO = float('NaN') + self.borderFS = float('NaN') #set defaults @@ -83,4 +84,5 @@ md = checkfield(md,'fieldname','flowequation.borderFS','size',[md.mesh.numberofvertices],'values',[0,1]) md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_r','numel',[1],'>',0.) + md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_rhop','numel',[1],'>',0.) md = checkfield(md,'fieldname','flowequation.XTH_theta','numel',[1],'>=',0.,'<',.5) if m.strcmp(md.mesh.domaintype(),'2Dhorizontal'): @@ -112,4 +114,5 @@ WriteData(fid,'enum',FlowequationFeFSEnum() ,'data',StringToEnum(self.fe_FS)[0] ,'format','Integer') WriteData(fid,'enum',AugmentedLagrangianREnum(),'data',self.augmented_lagrangian_r ,'format','Double') + WriteData(fid,'enum',AugmentedLagrangianRhopEnum(),'data',self.augmented_lagrangian_rhop ,'format','Double') WriteData(fid,'enum',AugmentedLagrangianThetaEnum() ,'data',self.XTH_theta ,'format','Double') WriteData(fid,'object',self,'fieldname','borderSSA','format','DoubleMat','mattype',1) Index: /issm/trunk-jpl/src/m/enum/AugmentedLagrangianRhopEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AugmentedLagrangianRhopEnum.m (revision 18208) +++ /issm/trunk-jpl/src/m/enum/AugmentedLagrangianRhopEnum.m (revision 18208) @@ -0,0 +1,11 @@ +function macro=AugmentedLagrangianRhopEnum() +%AUGMENTEDLAGRANGIANRHOPENUM - Enum of AugmentedLagrangianRhop +% +% 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=AugmentedLagrangianRhopEnum() + +macro=StringToEnum('AugmentedLagrangianRhop'); Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 18207) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 18208) @@ -641,4 +641,5 @@ def IncrementalEnum(): return StringToEnum("Incremental")[0] def AugmentedLagrangianREnum(): return StringToEnum("AugmentedLagrangianR")[0] +def AugmentedLagrangianRhopEnum(): return StringToEnum("AugmentedLagrangianRhop")[0] def AugmentedLagrangianThetaEnum(): return StringToEnum("AugmentedLagrangianTheta")[0] def NoneEnum(): return StringToEnum("None")[0]