Changeset 26300 for issm/trunk-jpl/src/m/classes/SMBforcing.js

Timestamp:

06/07/21 11:12:48 (4 years ago)

Author:

dlcheng

Message:

CHG (JS): Large update of JS classes in for solid earth/sea level solver.

File:

• issm/trunk-jpl/src/m/classes/SMBforcing.js (modified) (5 diffs)

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

@@ -12 +12 @@
                 console.log(sprintf('   surface forcings parameters:'));
                 fielddisplay(this,'mass_balance','surface mass balance [m/yr ice eq]');
+                fielddisplay(this,'steps_per_step', 'number of smb steps per time step');
                 fielddisplay(this,'requested_outputs','additional outputs requested');
+                fielddisplay(this,'averaging','averaging methods from short to long steps');
+                console.log(sprintf('%51s  0: Arithmetic (default)',' '));
+                console.log(sprintf('%51s  1: Geometric',' '));
+                console.log(sprintf('%51s  2: Harmonic',' '));
         } // }}}
         this.defaultoutputs = function(){ // {{{
@@ -33 +38 @@
     } // }}}
     this.checkconsistency = function(md,solution,analyses) { //{{{
-
+                if (solution=='TransientSolution' && md.transient.issmb == 0) return;
         if(ArrayAnyEqual(ArrayIsMember('MasstransportAnalysis',analyses),1)){
             checkfield(md,'fieldname','smb.mass_balance','timeseries',1,'NaN',1,'Inf',1);
@@ -40 +45 @@
             checkfield(md,'fieldname','smb.mass_balance','size',[md.mesh.numberofvertices,1],'NaN',1,'Inf',1);
         }
-        checkfield(md,'fieldname','smb.requested_outputs','stringrow',1);
-
+                checkfield(md,'fieldname','smb.steps_per_step','>=',1,'numel',[1]);
+                checkfield(md,'fieldname','smb.requested_outputs','stringrow',1);
+                checkfield(md,'fieldname','smb.averaging','numel',[1],'values',[0,1,2]);
     } // }}}
     this.marshall=function(md,prefix,fid) { //{{{
@@ -49 +55 @@
         WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer');
         WriteData(fid,prefix,'object',this,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                WriteData(fid,prefix,'object',this,'fieldname','steps_per_step','format','Integer');
+                WriteData(fid,prefix,'object',this,'fieldname','averaging','format','Integer');
 
         //process requested outputs
@@ -66 +74 @@
         //properties 
     // {{{
-        this.mass_balance = NaN;
-        this.requested_outputs      = [];
+        this.mass_balance          = NaN;
+        this.requested_outputs = [];
+        this.steps_per_step    = 1;
+        this.averaging         = 0;
         this.setdefaultparameters();
     // }}}