Changeset 19828

Timestamp:

11/27/15 11:10:38 (9 years ago)

Author:

Eric.Larour

Message:

CHG: fixed issues with transient and private classes still being used (in javascript).

Location:

issm/trunk-jpl/src/m/classes

Files:

• basalforcings.js (modified) (2 diffs)
• calving.js (modified) (1 diff)
• flowequation.js (modified) (1 diff)
• geometry.js (modified) (2 diffs)
• gia.js (modified) (1 diff)
• masstransport.js (modified) (1 diff)
• thermal.js (modified) (1 diff)
• trans.js (modified) (1 diff)

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

@@ -36 +36 @@
 
                         if(ArrayAnyEqual(ArrayIsMember(MasstransportAnalysisEnum(),analyses),1)){
-                                if (!(solution==TransientSolutionEnum() & md.transient.ismasstransport==0)){
+                                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);
@@ -47 +47 @@
                         }
                         if(ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1)){
-                                if (!(solution==TransientSolutionEnum() & md.transient.isthermal==0)){
+                                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);

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

@@ -26 +26 @@
         this.checkconsistency = function(md,solution,analyses) { // {{{
                 //Early return
-                if (solution!=TransientSolutionEnum() | md.transient.iscalving==0) return;
+                if (solution!=TransientSolutionEnum() | md.trans.iscalving==0) return;
 
                 checkfield(md,'fieldname','calving.spclevelset','timeseries',1);

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

@@ -42 +42 @@
                         //Early return
                         if ( ((!ArrayAnyEqual(ArrayIsMember(StressbalanceAnalysisEnum(),analyses),1)) & (!ArrayAnyEqual(ArrayIsMember(StressbalanceSIAAnalysisEnum(),analyses),1))) | 
-                                        (solution==TransientSolutionEnum() & md.transient.isstressbalance==0)
+                                        (solution==TransientSolutionEnum() & md.trans.isstressbalance==0)
                            ) return ;
 

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

@@ -21 +21 @@
                 this.checkconsistency = function(md,solution,analyses) { //{{{
 
-                        if ((solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum())){
+                        if ((solution==TransientSolutionEnum() & md.trans.isgia) | (solution==GiaSolutionEnum())){
                                 checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'>=',0);
                         }
@@ -34 +34 @@
                                         }
                                 }
-                                if (solution==TransientSolutionEnum() & md.transient.isgroundingline){
+                                if (solution==TransientSolutionEnum() & md.trans.isgroundingline){
                                         checkfield(md,'fieldname','geometry.bed','NaN',1,'size',[md.mesh.numberofvertices, 1]);
                                 }

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

@@ -33 +33 @@
                 //be sure that if we are running a masstransport ice flow model coupled with gia, that thickness forcings 
                 //are not provided into the future.
-                if (solution==TransientSolutionEnum() & md.transient.ismasstransport & md.transient.isgia){
+                if (solution==TransientSolutionEnum() & md.trans.ismasstransport & md.trans.isgia){
                         //figure out if thickness is a transient forcing: 
                         if (md.geometry.thickness.length == (md.mesh.numberofvertices+1)){

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

@@ -44 +44 @@
 
                         //Early return
-                        if(!ArrayAnyEqual(ArrayIsMember(HydrologyShreveAnalysisEnum(),analyses),1) | (solution==TransientSolutionEnum() & md.transient.ismasstransport==0)) return; 
+                        if(!ArrayAnyEqual(ArrayIsMember(HydrologyShreveAnalysisEnum(),analyses),1) | (solution==TransientSolutionEnum() & md.trans.ismasstransport==0)) return; 
 
                         checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1);

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

@@ -55 +55 @@
 
                 //Early return
-                if(!ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1) & !ArrayAnyEqual(ArrayIsMember(EnthalpyAnalysisEnum(),analyses),1)  | (solution == TransientSolutionEnum() & md.transient.isthermal==0)) return;
+                if(!ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1) & !ArrayAnyEqual(ArrayIsMember(EnthalpyAnalysisEnum(),analyses),1)  | (solution == TransientSolutionEnum() & md.trans.isthermal==0)) return;
 
                 checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0 ,1, 2]);

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

@@ -50 +50 @@
                         if (solution!=TransientSolutionEnum()) return;
 
-                        checkfield(md,'fieldname','transient.issmb','numel',[1],'values',[0 ,1]);
-                        checkfield(md,'fieldname','transient.ismasstransport','numel',[1],'values',[0 ,1]);
-                        checkfield(md,'fieldname','transient.isstressbalance','numel',[1],'values',[0 ,1]);
-                        checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0 ,1]);
-                        checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','transient.iscalving','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 ,1]);
-                        checkfield(md,'fieldname','transient.requested_outputs','stringrow',1);
+                        checkfield(md,'fieldname','trans.issmb','numel',[1],'values',[0 ,1]);
+                        checkfield(md,'fieldname','trans.ismasstransport','numel',[1],'values',[0 ,1]);
+                        checkfield(md,'fieldname','trans.isstressbalance','numel',[1],'values',[0 ,1]);
+                        checkfield(md,'fieldname','trans.isthermal','numel',[1],'values',[0 ,1]);
+                        checkfield(md,'fieldname','trans.isgroundingline','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','trans.isgia','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','trans.isdamageevolution','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','trans.islevelset','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','trans.iscalving','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','trans.ishydrology','numel',[1],'values',[0 ,1]);
+                        checkfield(md,'fieldname','trans.requested_outputs','stringrow',1);
                 } // }}}
                 this.marshall=function(md,fid) { //{{{