Changeset 18309 for issm/trunk-jpl/src/m/classes/flowequation.py

Timestamp:

07/31/14 10:32:07 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: check flow equations only if isstressbalance = 1

File:

• issm/trunk-jpl/src/m/classes/flowequation.py (modified) (1 diff)

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

@@ -73 +73 @@
         def checkconsistency(self,md,solution,analyses):    # {{{
 
-                if StressbalanceAnalysisEnum() in analyses:
-                        md = checkfield(md,'fieldname','flowequation.isSIA','numel',[1],'values',[0,1])
-                        md = checkfield(md,'fieldname','flowequation.isSSA','numel',[1],'values',[0,1])
-                        md = checkfield(md,'fieldname','flowequation.isL1L2','numel',[1],'values',[0,1])
-                        md = checkfield(md,'fieldname','flowequation.isHO','numel',[1],'values',[0,1])
-                        md = checkfield(md,'fieldname','flowequation.isFS','numel',[1],'values',[0,1])
-                        md = checkfield(md,'fieldname','flowequation.fe_SSA','values',['P1','P1bubble','P1bubblecondensed','P2','P2bubble'])
-                        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','XTaylorHood','OneLayerP4z','CrouzeixRaviart'])
-                        md = checkfield(md,'fieldname','flowequation.borderSSA','size',[md.mesh.numberofvertices],'values',[0,1])
-                        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.augmented_lagrangian_r','numel',[1],'>',0.)
-                        md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_rhop','numel',[1],'>',0.)
-                        md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_rlambda','numel',[1],'>',0.)
-                        md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_rholambda','numel',[1],'>',0.)
-                        md = checkfield(md,'fieldname','flowequation.XTH_theta','numel',[1],'>=',0.,'<',.5)
-                        if m.strcmp(md.mesh.domaintype(),'2Dhorizontal'):
-                                md = checkfield(md,'fieldname','flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',[1,2])
-                                md = checkfield(md,'fieldname','flowequation.element_equation','size',[md.mesh.numberofelements],'values',[1,2])
-                        elif m.strcmp(md.mesh.domaintype(),'3D'):
-                                md = checkfield(md,'fieldname','flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,8+1))
-                                md = checkfield(md,'fieldname','flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,8+1))
-                        else:
-                                raise RuntimeError('mesh type not supported yet')
-                        if not (self.isSIA or self.isSSA or self.isL1L2 or self.isHO or self.isFS):
-                                md.checkmessage("no element types set for this model")
+                #Early return
+                if (StressbalanceAnalysisEnum() not in analyses and StressbalanceSIAAnalysisEnum() not in analyses) or (solution==TransientSolutionEnum() and not md.transient.isstressbalance):
+                        return md
+
+                md = checkfield(md,'fieldname','flowequation.isSIA','numel',[1],'values',[0,1])
+                md = checkfield(md,'fieldname','flowequation.isSSA','numel',[1],'values',[0,1])
+                md = checkfield(md,'fieldname','flowequation.isL1L2','numel',[1],'values',[0,1])
+                md = checkfield(md,'fieldname','flowequation.isHO','numel',[1],'values',[0,1])
+                md = checkfield(md,'fieldname','flowequation.isFS','numel',[1],'values',[0,1])
+                md = checkfield(md,'fieldname','flowequation.fe_SSA','values',['P1','P1bubble','P1bubblecondensed','P2','P2bubble'])
+                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','XTaylorHood','OneLayerP4z','CrouzeixRaviart'])
+                md = checkfield(md,'fieldname','flowequation.borderSSA','size',[md.mesh.numberofvertices],'values',[0,1])
+                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.augmented_lagrangian_r','numel',[1],'>',0.)
+                md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_rhop','numel',[1],'>',0.)
+                md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_rlambda','numel',[1],'>',0.)
+                md = checkfield(md,'fieldname','flowequation.augmented_lagrangian_rholambda','numel',[1],'>',0.)
+                md = checkfield(md,'fieldname','flowequation.XTH_theta','numel',[1],'>=',0.,'<',.5)
+                if m.strcmp(md.mesh.domaintype(),'2Dhorizontal'):
+                        md = checkfield(md,'fieldname','flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',[1,2])
+                        md = checkfield(md,'fieldname','flowequation.element_equation','size',[md.mesh.numberofelements],'values',[1,2])
+                elif m.strcmp(md.mesh.domaintype(),'3D'):
+                        md = checkfield(md,'fieldname','flowequation.vertex_equation','size',[md.mesh.numberofvertices],'values',numpy.arange(0,8+1))
+                        md = checkfield(md,'fieldname','flowequation.element_equation','size',[md.mesh.numberofelements],'values',numpy.arange(0,8+1))
+                else:
+                        raise RuntimeError('mesh type not supported yet')
+                if not (self.isSIA or self.isSSA or self.isL1L2 or self.isHO or self.isFS):
+                        md.checkmessage("no element types set for this model")
 
                 if StressbalanceSIAAnalysisEnum() in analyses: