Changeset 21945 for issm/trunk-jpl/src/m/classes/model.js

Timestamp:

08/12/17 12:23:09 (8 years ago)

Author:

dlcheng

Message:

CHG: Updating model.js with esa and amr fields. Updating friction.js with coupling and effective_pressure handling.

File:

• issm/trunk-jpl/src/m/classes/model.js (modified) (3 diffs)

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

@@ -38 +38 @@
                         console.log(sprintf("//19s: //-22s -- //s","calving"         ,"[1x1 " + typeof(this.calving) + "]","parameters for calving"));
                         console.log(sprintf("//19s: //-22s -- //s","gia"             ,"[1x1 " + typeof(this.gia) + "]","parameters for gia solution"));
+                        console.log(sprintf("//19s: //-22s -- //s","esa"             ,"[1x1 " + typeof(this.esa) + "]","parameters for elastic adjustment solution"));
                         console.log(sprintf("//19s: //-22s -- //s","autodiff"        ,"[1x1 " + typeof(this.autodiff) + "]","automatic differentiation parameters"));
                         console.log(sprintf("//19s: //-22s -- //s","inversion"       ,"[1x1 " + typeof(this.inversion) + "]","parameters for inverse methods"));
@@ -77 +78 @@
                         this.steadystate      = new steadystate();
                         this.trans            = new trans();
-                        this.levelset             = new levelset();
+                        this.levelset         = new levelset();
                         this.calving          = new calving();
                         this.gia              = new giaivins();
+                        this.esa              = new esa();
                         this.autodiff         = new autodiff();
                         this.inversion        = new inversion();
                         this.qmu              = new qmu();
-                        this.amr                                         = new amr();
+                        this.amr              = new amr();
                         this.radaroverlay     = new radaroverlay();
                         this.results          = {};
@@ -610 +612 @@
                 this.calving          = 0;
                 this.gia              = 0;
+                this.esa              = 0;
 
                 this.autodiff         = 0;
                 this.inversion        = 0;
                 this.qmu              = 0;
-                this.amr                                         = 0;
+                this.amr              = 0;
 
                 this.results          = 0;