Changeset 19903

Timestamp:

12/16/15 14:51:50 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added check Inf on spc as well

Location:

issm/trunk-jpl/src

Files:

• m/classes/calving.js (modified) (1 diff)
• m/classes/calving.m (modified) (1 diff)
• m/classes/calving.py (modified) (1 diff)
• m/classes/calvingdev.m (modified) (1 diff)
• m/classes/calvinglevermann.m (modified) (1 diff)
• m/classes/calvinglevermann.py (modified) (1 diff)
• m/classes/calvingpi.m (modified) (1 diff)
• m/classes/damage.js (modified) (1 diff)
• m/classes/damage.m (modified) (1 diff)
• m/classes/damage.py (modified) (1 diff)
• m/classes/frictionwaterlayer.m (modified) (1 diff)
• m/classes/hydrologydc.m (modified) (2 diffs)
• m/classes/hydrologydc.py (modified) (2 diffs)
• m/classes/hydrologyshreve.js (modified) (1 diff)
• m/classes/hydrologyshreve.m (modified) (1 diff)
• m/classes/hydrologyshreve.py (modified) (1 diff)
• m/classes/masstransport.js (modified) (1 diff)
• m/classes/masstransport.m (modified) (1 diff)
• m/classes/masstransport.py (modified) (1 diff)
• m/classes/stressbalance.js (modified) (1 diff)
• m/classes/stressbalance.m (modified) (1 diff)
• m/classes/stressbalance.py (modified) (1 diff)
• m/classes/thermal.js (modified) (1 diff)
• m/classes/thermal.m (modified) (1 diff)
• m/classes/thermal.py (modified) (1 diff)
• py3/classes/calving.py (modified) (1 diff)
• py3/classes/calvinglevermann.py (modified) (1 diff)
• py3/classes/damage.py (modified) (1 diff)
• py3/classes/hydrologydc.py (modified) (2 diffs)
• py3/classes/hydrologyshreve.py (modified) (1 diff)
• py3/classes/masstransport.py (modified) (1 diff)
• py3/classes/stressbalance.py (modified) (1 diff)
• py3/classes/thermal.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/calving.js

@@ -28 +28 @@
                 if (solution!=TransientSolutionEnum() | md.trans.iscalving==0) return;
 
-                checkfield(md,'fieldname','calving.spclevelset','timeseries',1);
+                checkfield(md,'fieldname','calving.spclevelset','Inf',1,'timeseries',1);
                 checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
                 checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);

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

@@ -45 +45 @@
                         if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
 
-                        md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1);
+                        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.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);

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

@@ -53 +53 @@
                         return md
 
-                md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1)
+                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.calvingrate','>=',0,'timeseries',1,'NaN',1,'Inf',1);

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

@@ -47 +47 @@
                         if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
 
-                        md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1);
+                        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]);

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

@@ -47 +47 @@
                         if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
 
-                        md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1);
+                        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]);

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

@@ -53 +53 @@
                         return md
 
-                md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1)
+                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','size',[md.mesh.numberofvertices],'>',0)

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

@@ -47 +47 @@
                         if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
 
-                        md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1);
+                        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]);

issm/trunk-jpl/src/m/classes/damage.js

@@ -71 +71 @@
                                 checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2]);
                                 checkfield(md,'fieldname','damage.D','>=',0,'<=',self.max_damage,'size',[md.mesh.numberofvertices ,1]);
-                                checkfield(md,'fieldname','damage.spcdamage','timeseries',1);
+                                checkfield(md,'fieldname','damage.spcdamage','Inf',1,'timeseries',1);
                                 checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0);
                                 checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0, 1, 2, 4]);

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

@@ -140 +140 @@
                                 md = checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2]);
                                 md = checkfield(md,'fieldname','damage.D','>=',0,'<=',self.max_damage,'size',[md.mesh.numberofvertices 1]);
-                                md = checkfield(md,'fieldname','damage.spcdamage','timeseries',1);
+                                md = checkfield(md,'fieldname','damage.spcdamage','Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0);
                                 md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0 1 2 4]);

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

@@ -125 +125 @@
                         md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0)
                         md = checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2,3])
-                        md = checkfield(md,'fieldname','damage.spcdamage','timeseries',1)
+                        md = checkfield(md,'fieldname','damage.spcdamage','Inf',1,'timeseries',1)
                         md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0,1,2,4])
                         md = checkfield(md,'fieldname','damage.maxiter','>=0',0)

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

@@ -35 +35 @@
                         md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
                         md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
-                        md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1,'>=',0.);
+                        md = checkfield(md,'fieldname','thermal.spctemperature','Inf',1,'timeseries',1,'>=',0.);
 
                 end % }}}

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

@@ -116 +116 @@
                         md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'Inf',1,'timeseries',1);
 
-                        md = checkfield(md,'fieldname','hydrology.spcsediment_head','timeseries',1);
+                        md = checkfield(md,'fieldname','hydrology.spcsediment_head','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0,'numel',1);
                         md = checkfield(md,'fieldname','hydrology.sediment_porosity','>',0,'numel',1);
@@ -123 +123 @@
 
                         if self.isefficientlayer==1,
-                                md = checkfield(md,'fieldname','hydrology.spcepl_head','timeseries',1);
+                                md = checkfield(md,'fieldname','hydrology.spcepl_head','Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','hydrology.mask_eplactive_node','size',[md.mesh.numberofvertices 1],'values',[0 1]);
                                 md = checkfield(md,'fieldname','hydrology.epl_compressibility','>',0,'numel',1);

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

@@ -164 +164 @@
 
                 md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'Inf',1,'timeseries',1)
-                md = checkfield(md,'fieldname','hydrology.spcsediment_head','timeseries',1)
+                md = checkfield(md,'fieldname','hydrology.spcsediment_head','Inf',1,'timeseries',1)
                 md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0.,'numel',[1])
                 md = checkfield(md,'fieldname','hydrology.sediment_porosity','>',0.,'numel',[1])
@@ -170 +170 @@
                 md = checkfield(md,'fieldname','hydrology.sediment_transmitivity','>=',0,'size',[md.mesh.numberofvertices,1])
                 if self.isefficientlayer==1:
-                        md = checkfield(md,'fieldname','hydrology.spcepl_head','timeseries',1)
+                        md = checkfield(md,'fieldname','hydrology.spcepl_head','Inf',1,'timeseries',1)
                         md = checkfield(md,'fieldname','hydrology.mask_eplactive_node','size',[md.mesh.numberofvertices,1],'values',[0,1])
                         md = checkfield(md,'fieldname','hydrology.epl_compressibility','>',0.,'numel',[1])

issm/trunk-jpl/src/m/classes/hydrologyshreve.js

@@ -32 +32 @@
                         if(!ArrayAnyEqual(ArrayIsMember(HydrologyShreveAnalysisEnum(),analyses),1)) return;
 
-                        checkfield(md,'fieldname','hydrology.spcwatercolumn','timeseries',1);
+                        checkfield(md,'fieldname','hydrology.spcwatercolumn','Inf',1,'timeseries',1);
                         checkfield(md,'fieldname','hydrology.stabilization','>=',0);
 

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

@@ -45 +45 @@
                         end
 
-                        md = checkfield(md,'fieldname','hydrology.spcwatercolumn','timeseries',1);
+                        md = checkfield(md,'fieldname','hydrology.spcwatercolumn','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','hydrology.stabilization','>=',0);
                 end % }}}

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

@@ -43 +43 @@
                         return md
 
-                md = checkfield(md,'fieldname','hydrology.spcwatercolumn','timeseries',1)
+                md = checkfield(md,'fieldname','hydrology.spcwatercolumn','Inf',1,'timeseries',1)
                 md = checkfield(md,'fieldname','hydrology.stabilization','>=',0)
 

issm/trunk-jpl/src/m/classes/masstransport.js

@@ -46 +46 @@
                         if(!ArrayAnyEqual(ArrayIsMember(HydrologyShreveAnalysisEnum(),analyses),1) | (solution==TransientSolutionEnum() & md.trans.ismasstransport==0)) return; 
 
-                        checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1);
+                        checkfield(md,'fieldname','masstransport.spcthickness','Inf',1,'timeseries',1);
                         checkfield(md,'fieldname','masstransport.isfreesurface','values',[0 ,1]);
                         checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',['Absolute', 'Incremental']);

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

@@ -89 +89 @@
                         if ~ismember(MasstransportAnalysisEnum(),analyses) |  (solution==TransientSolutionEnum() & md.transient.ismasstransport==0), return; end
 
-                        md = checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1);
+                        md = checkfield(md,'fieldname','masstransport.spcthickness','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0 1]);
                         md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',{'Absolute' 'Incremental'});

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

@@ -72 +72 @@
                         return md
 
-                md = checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1)
+                md = checkfield(md,'fieldname','masstransport.spcthickness','Inf',1,'timeseries',1)
                 md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0,1])
                 md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',['Absolute','Incremental'])

issm/trunk-jpl/src/m/classes/stressbalance.js

@@ -81 +81 @@
                         if(ArrayAnyEqual(ArrayIsMember(StressbalanceAnalysisEnum(),analyses),0))return;
 
-                        checkfield(md,'fieldname','stressbalance.spcvx','timeseries',1);
-                        checkfield(md,'fieldname','stressbalance.spcvy','timeseries',1);
-                        checkfield(md,'fieldname','stressbalance.spcvz','timeseries',1);
+                        checkfield(md,'fieldname','stressbalance.spcvx','Inf',1,'timeseries',1);
+                        checkfield(md,'fieldname','stressbalance.spcvy','Inf',1,'timeseries',1);
+                        checkfield(md,'fieldname','stressbalance.spcvz','Inf',1,'timeseries',1);
                         checkfield(md,'fieldname','stressbalance.restol','size',[1, 1],'>',0,'NaN',1,'Inf',1);
                         checkfield(md,'fieldname','stressbalance.reltol','size',[1, 1]);

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

@@ -134 +134 @@
                         if ~ismember(StressbalanceAnalysisEnum(),analyses), return; end
 
-                        md = checkfield(md,'fieldname','stressbalance.spcvx','timeseries',1);
-                        md = checkfield(md,'fieldname','stressbalance.spcvy','timeseries',1);
-                        md = checkfield(md,'fieldname','stressbalance.spcvz','timeseries',1);
+                        md = checkfield(md,'fieldname','stressbalance.spcvx','Inf',1,'timeseries',1);
+                        md = checkfield(md,'fieldname','stressbalance.spcvy','Inf',1,'timeseries',1);
+                        md = checkfield(md,'fieldname','stressbalance.spcvz','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','stressbalance.restol','size',[1 1],'>',0,'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','stressbalance.reltol','size',[1 1]);

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

@@ -133 +133 @@
                         return md
 
-                md = checkfield(md,'fieldname','stressbalance.spcvx','timeseries',1)
-                md = checkfield(md,'fieldname','stressbalance.spcvy','timeseries',1)
+                md = checkfield(md,'fieldname','stressbalance.spcvx','Inf',1,'timeseries',1)
+                md = checkfield(md,'fieldname','stressbalance.spcvy','Inf',1,'timeseries',1)
                 if m.strcmp(md.mesh.domaintype(),'3D'):
-                        md = checkfield(md,'fieldname','stressbalance.spcvz','timeseries',1)
+                        md = checkfield(md,'fieldname','stressbalance.spcvz','Inf',1,'timeseries',1)
                 md = checkfield(md,'fieldname','stressbalance.restol','size',[1],'>',0)
                 md = checkfield(md,'fieldname','stressbalance.reltol','size',[1])

issm/trunk-jpl/src/m/classes/thermal.js

@@ -58 +58 @@
 
                 checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0 ,1, 2]);
-                checkfield(md,'fieldname','thermal.spctemperature','timeseries',1);
+                checkfield(md,'fieldname','thermal.spctemperature','Inf',1,'timeseries',1);
                 if(ArrayAnyEqual(ArrayIsMember(EnthalpyAnalysisEnum(),analyses),1) & md.thermal.isenthalpy & md.mesh.dimension() == 3){
                         

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

@@ -99 +99 @@
 
                         md = checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0 1 2]);
-                        md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1);
+                        md = checkfield(md,'fieldname','thermal.spctemperature','Inf',1,'timeseries',1);
                         if (ismember(EnthalpyAnalysisEnum(),analyses) & md.thermal.isenthalpy & dimension(md.mesh)==3),
                                 pos=find(md.thermal.spctemperature(1:md.mesh.numberofvertices,:)~=NaN);

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

@@ -95 +95 @@
 
                 md = checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0,1,2])
-                md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1)
+                md = checkfield(md,'fieldname','thermal.spctemperature','Inf',1,'timeseries',1)
                 if EnthalpyAnalysisEnum() in analyses and md.thermal.isenthalpy and md.mesh.dimension()==3:
                         pos=numpy.nonzero(numpy.logical_not(numpy.isnan(md.thermal.spctemperature[0:md.mesh.numberofvertices])))

issm/trunk-jpl/src/py3/classes/calving.py

@@ -53 +53 @@
                         return md
 
-                md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1)
+                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.calvingrate','>=',0,'timeseries',1,'NaN',1,'Inf',1);

issm/trunk-jpl/src/py3/classes/calvinglevermann.py

@@ -53 +53 @@
                         return md
 
-                md = checkfield(md,'fieldname','calving.spclevelset','timeseries',1)
+                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','size',[md.mesh.numberofvertices],'>',0)

issm/trunk-jpl/src/py3/classes/damage.py

@@ -124 +124 @@
                         md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0)
                         md = checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2,3])
-                        md = checkfield(md,'fieldname','damage.spcdamage','timeseries',1)
+                        md = checkfield(md,'fieldname','damage.spcdamage','Inf',1,'timeseries',1)
                         md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0,1,2,4])
                         md = checkfield(md,'fieldname','damage.maxiter','>=0',0)

issm/trunk-jpl/src/py3/classes/hydrologydc.py

@@ -164 +164 @@
 
                 md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'Inf',1,'timeseries',1)
-                md = checkfield(md,'fieldname','hydrology.spcsediment_head','timeseries',1)
+                md = checkfield(md,'fieldname','hydrology.spcsediment_head','Inf',1,'timeseries',1)
                 md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0.,'numel',[1])
                 md = checkfield(md,'fieldname','hydrology.sediment_porosity','>',0.,'numel',[1])
@@ -170 +170 @@
                 md = checkfield(md,'fieldname','hydrology.sediment_transmitivity','>=',0,'size',[md.mesh.numberofvertices,1])
                 if self.isefficientlayer==1:
-                        md = checkfield(md,'fieldname','hydrology.spcepl_head','timeseries',1)
+                        md = checkfield(md,'fieldname','hydrology.spcepl_head','Inf',1,'timeseries',1)
                         md = checkfield(md,'fieldname','hydrology.mask_eplactive_node','size',[md.mesh.numberofvertices,1],'values',[0,1])
                         md = checkfield(md,'fieldname','hydrology.epl_compressibility','>',0.,'numel',[1])

issm/trunk-jpl/src/py3/classes/hydrologyshreve.py

@@ -43 +43 @@
                         return md
 
-                md = checkfield(md,'fieldname','hydrology.spcwatercolumn','timeseries',1)
+                md = checkfield(md,'fieldname','hydrology.spcwatercolumn','Inf',1,'timeseries',1)
                 md = checkfield(md,'fieldname','hydrology.stabilization','>=',0)
 

issm/trunk-jpl/src/py3/classes/masstransport.py

@@ -72 +72 @@
                         return md
 
-                md = checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1)
+                md = checkfield(md,'fieldname','masstransport.spcthickness','Inf',1,'timeseries',1)
                 md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0,1])
                 md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',['Absolute','Incremental'])

issm/trunk-jpl/src/py3/classes/stressbalance.py

@@ -133 +133 @@
                         return md
 
-                md = checkfield(md,'fieldname','stressbalance.spcvx','timeseries',1)
-                md = checkfield(md,'fieldname','stressbalance.spcvy','timeseries',1)
+                md = checkfield(md,'fieldname','stressbalance.spcvx','Inf',1,'timeseries',1)
+                md = checkfield(md,'fieldname','stressbalance.spcvy','Inf',1,'timeseries',1)
                 if m.strcmp(md.mesh.domaintype(),'3D'):
-                        md = checkfield(md,'fieldname','stressbalance.spcvz','timeseries',1)
+                        md = checkfield(md,'fieldname','stressbalance.spcvz','Inf',1,'timeseries',1)
                 md = checkfield(md,'fieldname','stressbalance.restol','size',[1],'>',0)
                 md = checkfield(md,'fieldname','stressbalance.reltol','size',[1])

issm/trunk-jpl/src/py3/classes/thermal.py

@@ -95 +95 @@
 
                 md = checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0,1,2])
-                md = checkfield(md,'fieldname','thermal.spctemperature','timeseries',1)
+                md = checkfield(md,'fieldname','thermal.spctemperature','Inf',1,'timeseries',1)
                 if EnthalpyAnalysisEnum() in analyses and md.thermal.isenthalpy and md.mesh.dimension()==3:
                         pos=numpy.nonzero(numpy.logical_not(numpy.isnan(md.thermal.spctemperature[0:md.mesh.numberofvertices])))