Changeset 24521

Timestamp:

01/14/20 20:09:11 (5 years ago)

Author:

jdquinn

Message:

CHG: Modification to short-circuit

Location:

issm/trunk-jpl/src/m/classes

Files:

• slr.js (modified) (8 diffs)
• slr.py (modified) (1 diff)

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

@@ -7 +7 @@
         //methods
                 this.setdefaultparameters = function (){ //{{{
-                
+
                 //Convergence criterion: absolute, relative and residual
-                this.reltol=0.01; // 1 per cent 
+                this.reltol=0.01; // 1 per cent
                 this.abstol=NaN;  //default
 
@@ -15 +15 @@
                 this.maxiter=5;
 
-                //computational flags: 
+                //computational flags:
                 this.rigid=1;
                 this.elastic=1;
                 this.rotation=0;
                 this.ocean_area_scaling=0;
-                
-                //tidal love numbers: 
+
+                //tidal love numbers:
                 this.tide_love_h=0.6149; //degree 2
                 this.tide_love_k=0.3055; //degree 2
-        
-                //secular fluid love number: 
-                this.fluid_love=0.942; 
-                
-                //moment of inertia: 
-                this.equatorial_moi=8.0077*10^37; // [kg m^2] 
-                this.polar_moi           =8.0345*10^37; // [kg m^2] 
+
+                //secular fluid love number:
+                this.fluid_love=0.942;
+
+                //moment of inertia:
+                this.equatorial_moi=8.0077*10^37; // [kg m^2]
+                this.polar_moi           =8.0345*10^37; // [kg m^2]
 
                 // mean rotational velocity of earth:
-                this.angular_velocity=7.2921*10^-5; // [s^-1] 
+                this.angular_velocity=7.2921*10^-5; // [s^-1]
 
                 //numerical discretization accuracy
                 this.degacc=.01;
-                
-                //steric: 
+
+                //steric:
                 this.steric_rate=0;
-                
-                
+
+
                 //output default:
                 this.requested_outputs=['default'];
 
-                //transitions should be a cell array of vectors: 
+                //transitions should be a cell array of vectors:
                 this.transitions=[];
-                
+
                 }// }}}
                 this.checkconsistency = function(md,solution,analyses) { //{{{
 
                         //Early return
-                        if(ArrayAnyEqual(ArrayIsMember('SealevelriseAnalysis',analyses),0))return;
-                        
+                        if (ArrayAnyEqual(ArrayIsMember('SealevelriseAnalysis',analyses),0) || ArrayAnyEqual(ArrayIsMember('TransientSolution',analyses),0) && !md.transient.isslr) {
+                                return;
+                        }
+
                         md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements, 1]);
                         md = checkfield(md,'fieldname','slr.sealevel','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices, 1]);
@@ -71 +73 @@
                         md = checkfield(md,'fieldname','slr.degacc','size',[1, 1],'>=',1e-10);
                         md = checkfield(md,'fieldname','slr.requested_outputs','stringrow',1);
-                        
-                        //check that love numbers are provided at the same level of accuracy: 
+
+                        //check that love numbers are provided at the same level of accuracy:
                         if (this.love_h.length != this.love_k.length || this.love_h.length != this.love_l.length){
                                 throw Error('slr error message: love numbers should be provided at the same level of accuracy');
@@ -85 +87 @@
                 }// }}}
                 this.disp= function(){// {{{
-                        
+
                         console.log(sprintf('   Sealevelrise solution parameters:'));
 
@@ -95 +97 @@
                 fielddisplay(this,'love_h','load Love number for radial displacement');
                 fielddisplay(this,'love_k','load Love number for gravitational potential perturbation');
-                fielddisplay(this,'love_l','load Love number for horizontal displacements'); 
+                fielddisplay(this,'love_l','load Love number for horizontal displacements');
                 fielddisplay(this,'tide_love_h','tidal love number (degree 2)');
                 fielddisplay(this,'tide_love_k','tidal love number (degree 2)');
@@ -101 +103 @@
                 fielddisplay(this,'equatorial_moi','mean equatorial moment of inertia [kg m^2]');
                 fielddisplay(this,'polar_moi','polar moment of inertia [kg m^2]');
-                fielddisplay(this,'angular_velocity','mean rotational velocity of earth [per second]'); 
+                fielddisplay(this,'angular_velocity','mean rotational velocity of earth [per second]');
                 fielddisplay(this,'rigid','rigid earth graviational potential perturbation');
                 fielddisplay(this,'elastic','elastic earth graviational potential perturbation');
                 fielddisplay(this,'rotation','rotational earth potential perturbation');
-                fielddisplay(this,'ocean_area_scaling','correction for model representation of ocean area [default: No correction]'); 
+                fielddisplay(this,'ocean_area_scaling','correction for model representation of ocean area [default: No correction]');
                 fielddisplay(this,'degacc',"accuracy (default .01 deg) for numerical discretization of the Green's functions");
                 fielddisplay(this,'transitions','indices into parts of the mesh that will be icecaps');
                 fielddisplay(this,'requested_outputs','additional outputs requested');
-                fielddisplay(this,'steric_rate','rate of steric ocean expansion [mm/yr]'); 
+                fielddisplay(this,'steric_rate','rate of steric ocean expansion [mm/yr]');
                 } //}}}
                 this.marshall=function(md,prefix,fid) { //{{{
@@ -171 +173 @@
         //{{{
         this.deltathickness = NaN;
-        this.sealevel       = NaN; 
+        this.sealevel       = NaN;
         this.maxiter        = 0;
         this.reltol         = 0;
@@ -178 +180 @@
         this.love_k         = 0; //idam
         this.love_l         = 0; //idam
-        this.tide_love_h    = 0; 
-        this.tide_love_k    = 0; 
-        this.fluid_love   = 0; 
-        this.equatorial_moi     = 0; 
-        this.polar_moi                  = 0; 
-        this.angular_velocity = 0; 
+        this.tide_love_h    = 0;
+        this.tide_love_k    = 0;
+        this.fluid_love   = 0;
+        this.equatorial_moi     = 0;
+        this.polar_moi                  = 0;
+        this.angular_velocity = 0;
         this.rigid          = 0;
         this.elastic        = 0;
         this.rotation       = 0;
         this.ocean_area_scaling = 0;
-        this.steric_rate    = 0; //rate of ocean expansion from steric effects. 
+        this.steric_rate    = 0; //rate of ocean expansion from steric effects.
         this.degacc         = 0;
         this.requested_outputs = [];

issm/trunk-jpl/src/m/classes/slr.py

@@ -127 +127 @@
     def checkconsistency(self, md, solution, analyses):  # {{{
         #Early return
-        if (solution != 'SealevelriseAnalysis') (solution == 'TransientSolution' and not md.transient.isslr:
+        if (solution != 'SealevelriseAnalysis') or (solution == 'TransientSolution' and not md.transient.isslr:
             return md