Changeset 26305

Timestamp:

06/08/21 12:01:35 (4 years ago)

Author:

dlcheng

Message:

CHG (JS): Fixes and updates for remaining JS classes for solid earth/sea-level-solver/test2002.

Location:

issm/trunk-jpl/src/m

Files:

• classes/flowequation.js (modified) (1 diff)
• classes/fourierlove.js (modified) (2 diffs)
• classes/friction.js (modified) (2 diffs)
• classes/frontalforcings.js (added)
• classes/geometry.js (modified) (1 diff)
• classes/groundingline.js (modified) (1 diff)
• classes/levelset.js (modified) (1 diff)
• classes/materials.js (added)
• classes/mesh3dsurface.js (modified) (2 diffs)
• classes/model.js (modified) (2 diffs)
• classes/sampling.js (added)
• classes/transient.js (moved) (moved from issm/trunk-jpl/src/m/classes/trans.js ) (2 diffs)
• classes/verbose.js (modified) (3 diffs)
• solve/WriteData.js (modified) (4 diffs)

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

@@ -142 +142 @@
         this.isFS                           = 0;
         this.isNitscheBC                    = 0;
-        this.FSNitscheGamma                 = 0;
+        this.FSNitscheGamma                 = 1e6;
         this.fe_SSA                         = '';
         this.fe_HO                          = '';

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

@@ -18 +18 @@
                         this.g0=9.81; // m/s^2; 
                         this.r0=6371*1e3; //m;
-                        this.mu0=10^11; // Pa
+                        this.mu0=1e11; // Pa
                         this.Gravitational_Constant=6.67259e-11; // m^3 kg^-1 s^-2
                         this.allow_layer_deletion=1;
@@ -86 +86 @@
                 /*
                 if ~isa(md.materials,'materials') | ~sum(strcmpi(md.materials.nature,'litho'))
-                        error('Need a ''litho'' material to run a Fourier Love number analysis');
+                        error('Need a "litho" material to run a Fourier Love number analysis');
                 end
 

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

@@ -67 +67 @@
                         WriteData(fid,prefix,'name','md.friction.law','data',1,'format','Integer');
                         let mattype,tsl;
-                        if ((size(this.coefficient,1)==md.mesh.numberofvertices | size(this.coefficient,1)==md.mesh.numberofvertices+1)) {
+                        if ((size(this.coefficient,0)==md.mesh.numberofvertices | size(this.coefficient,1)==md.mesh.numberofvertices+1)) {
                                 mattype=1;
                                 tsl = md.mesh.numberofvertices;
@@ -81 +81 @@
                         switch (this.coupling) {
                                 case 0:
+                                        break;
                                 case 1:
                                         WriteData(fid,prefix,'class','friction','object',this,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);

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

@@ -48 +48 @@
                 } // }}}
                 this.marshall=function(md,prefix,fid) { //{{{
-                        let length_thickness=size(this.thickness,1);
+                        let length_thickness=size(this.thickness,0);
                         if (length_thickness==md.mesh.numberofvertices || length_thickness==md.mesh.numberofvertices+1) {
                                 WriteData(fid,prefix,'object',this,'fieldname','thickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);

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

@@ -47 +47 @@
                 this.marshall=function(md,prefix,fid) { //{{{
                         WriteData(fid,prefix,'data',this.migration,'name','md.groundingline.migration','format','String');
-                        WriteData(fid,prefix,'data',this.migration,'name','md.groundingline.friction_interpolation','format','String');
-                        WriteData(fid,prefix,'data',this.migration,'name','md.groundingline.melt_interpolation','format','String');
+                        WriteData(fid,prefix,'data',this.friction_interpolation,'name','md.groundingline.friction_interpolation','format','String');
+                        WriteData(fid,prefix,'data',this.melt_interpolation,'name','md.groundingline.melt_interpolation','format','String');
                 }//}}}
                 this.fix=function() { //{{{

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

@@ -8 +8 @@
         this.setdefaultparameters = function(){// {{{
 
-                //stabilization = 2 by default
-                this.stabilization              = 2;
+                //stabilization = 1 by default
+                this.stabilization              = 1;
                 this.reinit_frequency   = 5;
                 this.kill_icebergs      = 1;

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

@@ -87 +87 @@
                         WriteData(fid,prefix,'object',this,'fieldname','long','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',this,'fieldname','r','format','DoubleMat','mattype',1);
+                        //WriteData(fid,prefix,'object',this,'fieldname','z','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',this,'fieldname','elements','format','DoubleMat','mattype',2);
                         WriteData(fid,prefix,'object',this,'fieldname','numberofelements','format','Integer');
@@ -92 +93 @@
                         WriteData(fid,prefix,'object',this,'fieldname','average_vertex_connectivity','format','Integer');
                         WriteData(fid,prefix,'object',this,'fieldname','vertexonboundary','format','DoubleMat','mattype',1);
-                        WriteData(fid,prefix,'object',this,'fieldname','segments','format','DoubleMat','mattype',3);
+                        //WriteData(fid,prefix,'object',this,'fieldname','segments','format','DoubleMat','mattype',3);
                 }//}}}
                 this.fix=function() { //{{{

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

@@ -86 +86 @@
                         this.calving          = new calving();
                         this.gia              = new giaivins();
+                        this.frontforcings    = new frontforcings();
                         this.love             = new fourierlove();
                         this.esa              = new esa();
@@ -759 +760 @@
                 this.levelset         = 0;
                 this.calving          = 0;
+                this.frontforcings        = 0;
                 this.love             = 0;
                 this.gia              = 0;

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

@@ -1 @@
-//TRANS class definition
+//TRANSIENT class definition
 //
 //   Usage:
-//      trans =new trans();
+//      transient =new transient();
 
-function trans (){
+function transient (){
         //methods
         this.setdefaultparameters = function(){// {{{
@@ -58 +58 @@
                         if (solution!='TransientSolution') return;
 
-                        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.isesa','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','trans.isdamageevolution','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','trans.ismovingfront','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','trans.ishydrology','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','trans.isslr','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','trans.isoceancoupling','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','trans.iscoupler','numel',[1],'values',[0, 1]);
-                        checkfield(md,'fieldname','trans.amr_frequency','numel',[1],'>=',0,'NaN',1,'Inf',1);
-                        checkfield(md,'fieldname','trans.requested_outputs','stringrow',1);
+                        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.isesa','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','transient.ismovingfront','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','transient.isslr','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','transient.isoceancoupling','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','transient.iscoupler','numel',[1],'values',[0, 1]);
+                        checkfield(md,'fieldname','transient.amr_frequency','numel',[1],'>=',0,'NaN',1,'Inf',1);
+                        checkfield(md,'fieldname','transient.requested_outputs','stringrow',1);
                 } // }}}
                 this.marshall=function(md,prefix,fid) { //{{{

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

@@ -25 +25 @@
         //methods
         this.setdefaultparameters = function(){// {{{
+                //switch(nargin),
+                        //case 0,
+                this.verbose.solution=true;
+                this.verbose.qmu=true;
+                this.verbose.control=true;
         }// }}}
         this.disp= function(){// {{{
@@ -67 +72 @@
         //properties 
         // {{{
-        //BEGINFIELDS
         this.mprocessor=false;
         this.module=false;
@@ -77 +81 @@
         this.autodiff=false;
         this.smb=false;
-        //ENDFIELDS
+
+        this.setdefaultparameters();
         // }}}
-        this.setdefaultparameters();
-        //}}}
 }

issm/trunk-jpl/src/m/solve/WriteData.js

@@ -133 +133 @@
         else if (format == 'BooleanMat'){ // {{{
 
-                //Get size
-                var s=[data.length,1];
-                if(IsArray(data[0]))s[1]=data[0].length;
+                //Get size (TODO: use into matlab.js::size)
+                var s=[data.length,1]; //vector
+                if (IsArray(data[0])) { //matrix
+                        s[1]=data[0].length;
+        } else if (typeof data == 'number') { //scalar
+                s[0]=1; s[1]=1
+        } else if (data.length == 0) { //empty matrix/vector
+            s[1]=0;
+        }
 
                 //if matrix = NaN, then do not write anything
-                if (s[0]==1 & s[1]==1 & isNaN(data)){
-                        s[0]=0; s[1]=0;
-                }
-                if (s[0]==1 & s[1]==1 & isNaN(data[0])){
+                if (s[0]==1 && s[1]==1 && isNaN(data)){
+                        s[0]=0; s[1]=0;
+                }
+                if (typeof data != 'number' && s[0]==1 && s[1]==1 && isNaN(data[0])){
                         s[0]=0; s[1]=0;
                 }
@@ -159 +165 @@
         else if (format == 'IntMat'){ // {{{
 
-                //Get size
-                var s=[data.length,1];
-                if(IsArray(data[0]))s[1]=data[0].length;
+                //Get size (TODO: use into matlab.js::size)
+                var s=[data.length,1]; //vector
+                if (IsArray(data[0])) { //matrix
+                        s[1]=data[0].length;
+        } else if (typeof data == 'number') { //scalar
+                s[0]=1; s[1]=1
+        } else if (data.length == 0) { //empty matrix/vector
+            s[1]=0;
+        }
 
                 //if matrix = NaN, then do not write anything
-                if (s[0]==1 & s[1]==1 & isNaN(data)){
-                        s[0]=0; s[1]=0;
-                }
-                if (s[0]==1 & s[1]==1 & isNaN(data[0])){
+                if (s[0]==1 && s[1]==1 && isNaN(data)){
+                        s[0]=0; s[1]=0;
+                }
+                if (typeof data != 'number' && s[0]==1 && s[1]==1 && isNaN(data[0])){
                         s[0]=0; s[1]=0;
                 }
@@ -186 +198 @@
         else if (format == 'DoubleMat'){ // {{{
 
-                //Get size
-                var s=[data.length,1];
-                if(IsArray(data[0]))s[1]=data[0].length;
-                if(typeof data == 'number'){s[0]=1; s[1]=1}
-
+                //Get size (TODO: use into matlab.js::size)
+                var s=[data.length,1]; //vector
+                if (IsArray(data[0])) { //matrix
+                        s[1]=data[0].length;
+        } else if (typeof data == 'number') { //scalar
+                s[0]=1; s[1]=1
+        } else if (data.length == 0) { //empty matrix/vector
+            s[1]=0;
+        }
+        
                 //if matrix = NaN, then do not write anything
-                if (s[0]==1 & s[1]==1 & isNaN(data)){
-                        s[0]=0; s[1]=0;
-                }
-                if (s[0]==1 & s[1]==1 & isNaN(data[0])){
+                if (s[0]==1 && s[1]==1 && isNaN(data)){
+                        s[0]=0; s[1]=0;
+                }
+                if (typeof data != 'number' && s[0]==1 && s[1]==1 && isNaN(data[0])){
                         s[0]=0; s[1]=0;
                 }
@@ -252 +269 @@
                 //first get length of string array: 
                 num=data.length;
-                if ((typeof data[0] == 'numeric') & num==1 & isNaN(data[0])){
+                if ((typeof data[0] == 'number') & num==1 & isNaN(data[0])){
                         num = 0;
                 }