Changeset 17659

Timestamp:

04/07/14 13:14:01 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added r and theta as model parameters in md.flowequations

Location:

issm/trunk-jpl/src

Files:

• c/analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)
• c/solutionsequences/solutionsequence_la_theta.cpp (modified) (2 diffs)
• m/classes/flowequation.m (modified) (3 diffs)
• m/classes/flowequation.py (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -90 +90 @@
 
         /*Intermediaries*/
-        int         numoutputs;
-        char**      requestedoutputs = NULL;
+        int     fe_FS;
+        int     numoutputs;
+        char**  requestedoutputs = NULL;
 
         parameters->AddObject(iomodel->CopyConstantObject(FlowequationIsSIAEnum));
@@ -109 +110 @@
         parameters->AddObject(iomodel->CopyConstantObject(StressbalanceShelfDampeningEnum));
         parameters->AddObject(iomodel->CopyConstantObject(StressbalanceViscosityOvershootEnum));
+
+        /*XTH parameters*/
+        iomodel->Constant(&fe_FS,FlowequationFeFSEnum);
+        if(fe_FS==XTaylorHoodEnum){
+                parameters->AddObject(iomodel->CopyConstantObject(AugmentedLagrangianREnum));
+                parameters->AddObject(iomodel->CopyConstantObject(AugmentedLagrangianThetaEnum));
+        }
 
         /*Requested outputs*/

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_la_theta.cpp

@@ -19 +19 @@
         Vector<IssmDouble>*  df     = NULL;
         Vector<IssmDouble>*  ys     = NULL;
-        IssmDouble           eps_rel;
-        int  configuration_type,max_nonlinear_iterations;
-
-        IssmDouble r     = .6;
-        IssmDouble theta = 0.; // 0<theta<.5   -> .15<theta<.45
+        IssmDouble           eps_rel,r,theta; // 0<theta<.5   -> .15<theta<.45
+        int                  configuration_type,max_nonlinear_iterations;
 
         /*Create analysis*/
@@ -32 +29 @@
         femmodel->parameters->FindParam(&eps_rel,StressbalanceReltolEnum);
         femmodel->parameters->FindParam(&max_nonlinear_iterations,StressbalanceMaxiterEnum);
-        femmodel->parameters->SetParam(.6,AugmentedLagrangianREnum);
-        femmodel->parameters->SetParam(theta,AugmentedLagrangianThetaEnum);
+        femmodel->parameters->FindParam(&r,AugmentedLagrangianREnum);
+        femmodel->parameters->FindParam(&theta,AugmentedLagrangianThetaEnum);
 
         /*Update constraints and initialize d and tau if necessary*/

issm/trunk-jpl/src/m/classes/flowequation.m

@@ -14 +14 @@
                 fe_HO            = '';
                 fe_FS            = '';
+                XTH_r            = 1.;
+                XTH_theta        = 0.;
                 vertex_equation  = NaN;
                 element_equation = NaN;
@@ -88 +90 @@
                                 md = checkfield(md,'fieldname','flowequation.fe_HO' ,'values',{'P1','P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2','P1xP3','P2xP4'});
                                 md = checkfield(md,'fieldname','flowequation.fe_FS' ,'values',{'P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood','XTaylorHood','OneLayerP4z'});
+                                md = checkfield(md,'fieldname','flowequation.XTH_r','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]);
                                 md = checkfield(md,'fieldname','flowequation.borderHO','size',[md.mesh.numberofvertices 1],'values',[0 1]);
@@ -143 +147 @@
                         WriteData(fid,'enum',FlowequationFeHOEnum() ,'data',StringToEnum(obj.fe_HO) ,'format','Integer');
                         WriteData(fid,'enum',FlowequationFeFSEnum() ,'data',StringToEnum(obj.fe_FS) ,'format','Integer');
+                        WriteData(fid,'enum',AugmentedLagrangianREnum() ,'data',obj.XTH_r ,'format','Double');
+                        WriteData(fid,'enum',AugmentedLagrangianThetaEnum() ,'data',obj.XTH_theta ,'format','Double');
                         WriteData(fid,'object',obj,'fieldname','borderSSA','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','borderHO','format','DoubleMat','mattype',1);

issm/trunk-jpl/src/m/classes/flowequation.py

@@ -25 +25 @@
                 self.fe_HO            = ''
                 self.fe_FS            = ''
+                self.XTH_r            = 1.
+                self.XTH_theta        = 0.
                 self.vertex_equation  = float('NaN')
                 self.element_equation = float('NaN')
@@ -80 +82 @@
                         md = checkfield(md,'fieldname','flowequation.borderHO','size',[md.mesh.numberofvertices],'values',[0,1])
                         md = checkfield(md,'fieldname','flowequation.borderFS','size',[md.mesh.numberofvertices],'values',[0,1])
+                        md = checkfield(md,'fieldname','flowequation.XTH_r','numel',[1],'>',0.)
+                        md = checkfield(md,'fieldname','flowequation.XTH_theta','numel',[1],'>=',0.,'<',.5)
                         if m.strcmp(md.mesh.meshtype(),'2Dhorizontal'):
                                 md = checkfield(md,'fieldname','flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',[1,2])
@@ -107 +111 @@
                 WriteData(fid,'enum',FlowequationFeHOEnum() ,'data',StringToEnum(self.fe_HO)[0] ,'format','Integer')
                 WriteData(fid,'enum',FlowequationFeFSEnum() ,'data',StringToEnum(self.fe_FS)[0] ,'format','Integer')
+                WriteData(fid,'enum',AugmentedLagrangianREnum() ,'data',self.XTH_r ,'format','Double')
+                WriteData(fid,'enum',AugmentedLagrangianThetaEnum() ,'data',self.XTH_theta ,'format','Double')
                 WriteData(fid,'object',self,'fieldname','borderSSA','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','borderHO','format','DoubleMat','mattype',1)