Changeset 19901

Timestamp:

12/16/15 14:47:19 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added check isinf in js, need to add the same to checkconsistency

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBforcing.js (modified) (1 diff)
• balancethickness.js (modified) (1 diff)
• basalforcings.js (modified) (1 diff)
• calving.js (modified) (1 diff)
• friction.js (modified) (1 diff)
• geometry.js (modified) (2 diffs)
• gia.js (modified) (1 diff)
• initialization.js (modified) (4 diffs)
• inversion.js (modified) (1 diff)
• matice.js (modified) (1 diff)
• mesh2d.js (modified) (2 diffs)
• stressbalance.js (modified) (1 diff)
• timestepping.js (modified) (1 diff)

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

@@ -31 +31 @@
 
                         if(ArrayAnyEqual(ArrayIsMember(MasstransportAnalysisEnum(),analyses),1)){
-                                checkfield(md,'fieldname','smb.mass_balance','timeseries',1,'NaN',1);
+                                checkfield(md,'fieldname','smb.mass_balance','timeseries',1,'NaN',1,'Inf',1);
                         }
                         if(ArrayAnyEqual(ArrayIsMember(BalancethicknessAnalysisEnum(),analyses),1)){
-                                checkfield(md,'fieldname','smb.mass_balance','size',[md.mesh.numberofvertices,1],'NaN',1);
+                                checkfield(md,'fieldname','smb.mass_balance','size',[md.mesh.numberofvertices,1],'NaN',1,'Inf',1);
                         }
                         checkfield(md,'fieldname','smb.requested_outputs','stringrow',1);

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

@@ -29 +29 @@
 
                         checkfield(md,'fieldname','balancethickness.spcthickness');
-                        checkfield(md,'fieldname','balancethickness.thickening_rate','size',[md.mesh.numberofvertices ,1],'NaN',1);
+                        checkfield(md,'fieldname','balancethickness.thickening_rate','size',[md.mesh.numberofvertices ,1],'NaN',1,'Inf',1);
                         checkfield(md,'fieldname','balancethickness.stabilization','size',[1, 1],'values',[0, 1, 2 ,3]);
-                        //checkfield(md,'fieldname','balancethickness.omega','size',[md.mesh.numberofvertices ,1],'NaN',1,'>=',0);
+                        //checkfield(md,'fieldname','balancethickness.omega','size',[md.mesh.numberofvertices ,1],'NaN',1,'Inf',1,'>=',0);
                 } //}}}
                 this.marshall=function(md,fid) { //{{{

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

@@ -37 +37 @@
                         if(ArrayAnyEqual(ArrayIsMember(MasstransportAnalysisEnum(),analyses),1)){
                                 if (!(solution==TransientSolutionEnum() & md.trans.ismasstransport==0)){
-                                        checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
-                                        checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1);
+                                        checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
+                                        checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
                                 }
                         }
 
                         if(ArrayAnyEqual(ArrayIsMember(BalancethicknessAnalysisEnum(),analyses),1)){
-                                checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices, 1]);
-                                checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices, 1]);
+                                checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
+                                checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
                         }
                         if(ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1)){
                                 if (!(solution==TransientSolutionEnum() & md.trans.isthermal==0)){
-                                        checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
-                                        checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1);
-                                        checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0);
+                                        checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
+                                        checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
+                                        checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0);
                                 }
                         }

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

@@ -30 +30 @@
                 checkfield(md,'fieldname','calving.spclevelset','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);
-                checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1);
+                checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);
+                checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'timeseries',1,'NaN',1,'Inf',1);
         } //}}}
                 this.marshall=function(md,fid) { //{{{

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

@@ -24 +24 @@
                                 return; 
                         }
-                        md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1);
-                        md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements ,1]);
-                        md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements ,1]);
+                        md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1,'Inf',1);
+                        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]);
 
                 } // }}}

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

@@ -22 +22 @@
 
                         if ((solution==TransientSolutionEnum() & md.trans.isgia) | (solution==GiaSolutionEnum())){
-                                checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'>=',0);
+                                checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1,'>=',0);
                         }
                         else{
-                                checkfield(md,'fieldname','geometry.surface'  ,'NaN',1,'size',[md.mesh.numberofvertices, 1]);
-                                checkfield(md,'fieldname','geometry.base'      ,'NaN',1,'size',[md.mesh.numberofvertices, 1]);
-                                checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices, 1],'>',0);
+                                checkfield(md,'fieldname','geometry.surface'  ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
+                                checkfield(md,'fieldname','geometry.base'      ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
+                                checkfield(md,'fieldname','geometry.thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1],'>',0);
                                 for(var i=0;i<md.mesh.numberofvertices;i++){
                                         if (Math.abs(md.geometry.thickness.thickness-md.geometry.surface+md.geometry.base)>Math.pow(10,9)){
@@ -35 +35 @@
                                 }
                                 if (solution==TransientSolutionEnum() & md.trans.isgroundingline){
-                                        checkfield(md,'fieldname','geometry.bed','NaN',1,'size',[md.mesh.numberofvertices, 1]);
+                                        checkfield(md,'fieldname','geometry.bed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
                                 }
                         }

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

@@ -27 +27 @@
                 if(!ArrayAnyEqual(ArrayIsMember(GiaAnalysisEnum(),analyses),1))return;
 
-                checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0);
-                checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0);
+                checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1],'>',0);
+                checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1],'>',0);
                 checkfield(md,'fieldname','gia.cross_section_shape','numel',[1],'values',[1,2]);
 

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

@@ -27 +27 @@
                         if(ArrayAnyEqual(ArrayIsMember(StressbalanceAnalysisEnum(),analyses),1)){
                                 if (!(isNaN(md.initialization.vx) | isNaN(md.initialization.vy))){
-                                        checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices, 1]);
-                                        checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices, 1]);
+                                        checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
+                                        checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
                                 }
                         }
                         if(ArrayAnyEqual(ArrayIsMember(MasstransportAnalysisEnum(),analyses),1)){
-                                checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices, 1]);
-                                checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices, 1]);
+                                checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
+                                checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
                         }
                         if(ArrayAnyEqual(ArrayIsMember(BalancethicknessSolutionEnum(),analyses),1) & (solution==BalancethicknessSolutionEnum())){
-                                checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices, 1]);
-                                checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices, 1]);
+                                checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
+                                checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
                                 //Triangle with zero velocity
                                 for(var i=0;i<md.mesh.numberofelements;i++){
@@ -50 +50 @@
                         }
                         if(ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1)){
-                                checkfield(md,'fieldname','initialization.vx','NaN',1,'size',[md.mesh.numberofvertices, 1]);
-                                checkfield(md,'fieldname','initialization.vy','NaN',1,'size',[md.mesh.numberofvertices, 1]);
+                                checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
+                                checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
                                 if (md.mesh.dimension() == 3){
-                                        checkfield(md,'fieldname','initialization.vz','NaN',1,'size',[md.mesh.numberofvertices ,1]);
+                                        checkfield(md,'fieldname','initialization.vz','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices ,1]);
                                 }
-                                checkfield(md,'fieldname','initialization.pressure','NaN',1,'size',[md.mesh.numberofvertices ,1]);
-                                checkfield(md,'fieldname','initialization.temperature','NaN',1,'size',[md.mesh.numberofvertices ,1]);
+                                checkfield(md,'fieldname','initialization.pressure','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices ,1]);
+                                checkfield(md,'fieldname','initialization.temperature','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices ,1]);
                         }
                         if( ArrayAnyEqual(ArrayIsMember(EnthalpyAnalysisEnum(),analyses),1) & md.thermal.isenthalpy){
@@ -64 +64 @@
                         if(ArrayAnyEqual(ArrayIsMember(HydrologyShreveAnalysisEnum(),analyses),1)){
                                 if (md.hydrology.type() == 'hydrologyshreve'){
-                                        checkfield(md,'fieldname','initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices ,1]);
+                                        checkfield(md,'fieldname','initialization.watercolumn','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices ,1]);
                                 }
                         }
                         if(ArrayAnyEqual(ArrayIsMember(HydrologyDCInefficientAnalysisEnum(),analyses),1)){
                                 if (md.hydrology.type() == 'hydrologydc'){
-                                        checkfield(md,'fieldname','initialization.sediment_head','NaN',1,'size',[md.mesh.numberofvertices, 1]);
+                                        checkfield(md,'fieldname','initialization.sediment_head','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
                                 }
                         }
@@ -75 +75 @@
                                 if (md.hydrology.type() == 'hydrologydc'){
                                         if (md.hydrology.isefficientlayer==1){
-                                                checkfield(md,'fieldname','initialization.epl_head','NaN',1,'size',[md.mesh.numberofvertices ,1]);
-                                                checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'size',[md.mesh.numberofvertices ,1]);
+                                                checkfield(md,'fieldname','initialization.epl_head','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices ,1]);
+                                                checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices ,1]);
                                         }
                                 }

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

@@ -106 +106 @@
 
                         if (solution==BalancethicknessSolutionEnum()){
-                                checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices ,1],'NaN',1);
+                                checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices ,1],'NaN',1,'Inf',1);
                         }
                         else if (solution==BalancethicknessSoftSolutionEnum()){
-                                checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices, 1],'NaN',1);
+                                checkfield(md,'fieldname','inversion.thickness_obs','size',[md.mesh.numberofvertices, 1],'NaN',1,'Inf',1);
                         }
                         else{
-                                checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices ,1],'NaN',1);
-                                checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices ,1],'NaN',1);
+                                checkfield(md,'fieldname','inversion.vx_obs','size',[md.mesh.numberofvertices ,1],'NaN',1,'Inf',1);
+                                checkfield(md,'fieldname','inversion.vy_obs','size',[md.mesh.numberofvertices ,1],'NaN',1,'Inf',1);
                         }
                 } // }}}

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

@@ -86 +86 @@
                         checkfield(md,'fieldname','materials.rho_freshwater','>',0);
                         checkfield(md,'fieldname','materials.mu_water','>',0);
-                        checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1);
+                        checkfield(md,'fieldname','materials.rheology_B','>',0,'timeseries',1,'NaN',1,'Inf',1);
                         checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements,1]);
                         checkfield(md,'fieldname','materials.rheology_law','values',['None','Cuffey','Paterson','Arrhenius','LliboutryDuval']);

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

@@ -59 +59 @@
                 this.checkconsistency = function(md,solution,analyses){ //{{{
 
-                        checkfield(md,'fieldname','mesh.x','NaN',1,'size',[md.mesh.numberofvertices, 1]);
-                        checkfield(md,'fieldname','mesh.y','NaN',1,'size',[md.mesh.numberofvertices, 1]);
-                        checkfield(md,'fieldname','mesh.elements','NaN',1,'>',0,'values',NewArrayFillIncrement(md.mesh.numberofvertices,1,1));
+                        checkfield(md,'fieldname','mesh.x','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
+                        checkfield(md,'fieldname','mesh.y','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
+                        checkfield(md,'fieldname','mesh.elements','NaN',1,'Inf',1,'>',0,'values',NewArrayFillIncrement(md.mesh.numberofvertices,1,1));
                         checkfield(md,'fieldname','mesh.elements','size',[md.mesh.numberofelements, 3]);
                         if(ArrayAnyEqual(ArrayIsMember(NewArrayFillIncrement(md.mesh.numberofvertices,1,1),ArraySort(ArrayUnique(MatrixToList(md.mesh.elements)))),0)){
@@ -69 +69 @@
                         checkfield(md,'fieldname','mesh.numberofvertices','>',0);
                         checkfield(md,'fieldname','mesh.average_vertex_connectivity','>=',9,'message',"'mesh.average_vertex_connectivity' should be at least 9 in 2d");
-                        checkfield(md,'fieldname','mesh.segments','NaN',1,'>',0,'size',[NaN, 3]);
+                        checkfield(md,'fieldname','mesh.segments','NaN',1,'Inf',1,'>',0,'size',[NaN, 3]);
 
                         switch(solution){

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

@@ -84 +84 @@
                         checkfield(md,'fieldname','stressbalance.spcvy','timeseries',1);
                         checkfield(md,'fieldname','stressbalance.spcvz','timeseries',1);
-                        checkfield(md,'fieldname','stressbalance.restol','size',[1, 1],'>',0,'NaN',1);
+                        checkfield(md,'fieldname','stressbalance.restol','size',[1, 1],'>',0,'NaN',1,'Inf',1);
                         checkfield(md,'fieldname','stressbalance.reltol','size',[1, 1]);
                         checkfield(md,'fieldname','stressbalance.abstol','size',[1, 1]);
                         checkfield(md,'fieldname','stressbalance.isnewton','numel',[1],'values',[0, 1, 2]);
-                        checkfield(md,'fieldname','stressbalance.FSreconditioning','size',[1, 1],'NaN',1);
-                        checkfield(md,'fieldname','stressbalance.viscosity_overshoot','size',[1, 1],'NaN',1);
+                        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]);

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

@@ -39 +39 @@
                 this.checkconsistency = function(md,solution,analyses) { //{{{
                         
-                        checkfield(md,'fieldname','timestepping.start_time','numel',[1],'NaN',1);
-                        checkfield(md,'fieldname','timestepping.final_time','numel',[1],'NaN',1);
-                        checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>=',0,'NaN',1);
+                        checkfield(md,'fieldname','timestepping.start_time','numel',[1],'NaN',1,'Inf',1);
+                        checkfield(md,'fieldname','timestepping.final_time','numel',[1],'NaN',1,'Inf',1);
+                        checkfield(md,'fieldname','timestepping.time_step','numel',[1],'>=',0,'NaN',1,'Inf',1);
                         checkfield(md,'fieldname','timestepping.time_adapt','numel',[1],'values',[0,1]);
                         checkfield(md,'fieldname','timestepping.cfl_coefficient','numel',[1],'>',0,'<=',1);