Changeset 22352

Timestamp:

01/14/18 14:25:11 (7 years ago)

Author:

adhikari

Message:

CHG: md.esa.hemisphere introduced

Location:

issm/trunk-jpl/src/m/classes

Files:

• esa.js (modified) (6 diffs)
• esa.m (modified) (1 diff)
• esa.py (modified) (5 diffs)

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

@@ -10 +10 @@
                 //numerical discretization accuracy
                 this.degacc=.01;
-                
+        
+                //computational flags:
+                this.hemisphere=0;
+
                 //output default:
                 this.requested_outputs=['default'];
@@ -26 +29 @@
                         md = checkfield(md,'fieldname','esa.love_h','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','esa.love_l','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','esa.hemisphere','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','esa.degacc','size',[1, 1],'>=',1e-10);
                         md = checkfield(md,'fieldname','esa.requested_outputs','stringrow',1);
@@ -48 +52 @@
                 fielddisplay(this,'love_h','load Love number for radial displacement');
                 fielddisplay(this,'love_l','load Love number for horizontal displacements'); 
+                fielddisplay(this,'hemisphere','North-south, East-west components of 2-D horiz displacement vector: -1 south, 1 north'); 
                 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');
@@ -57 +62 @@
                         WriteData(fid,prefix,'object',this,'fieldname','love_h','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',this,'fieldname','love_l','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',this,'fieldname','hemisphere','format','Integer');
                         WriteData(fid,prefix,'object',this,'fieldname','degacc','format','Double');
                         WriteData(fid,prefix,'object',this,'fieldname','transitions','format','MatArray');
@@ -75 +81 @@
                         this.love_h=NullFix(this.love_h,NaN);
                         this.love_l=NullFix(this.love_l,NaN);
+                        this.hemisphere=NullFix(this.hemisphere,NaN);
                         this.degacc=NullFix(this.degacc,NaN);
                 }//}}}
@@ -82 +89 @@
         this.love_h         = 0; //provided by PREM model
         this.love_l         = 0; //idam
+        this.hemisphere     = 0;
         this.degacc         = 0;
         this.requested_outputs = [];

issm/trunk-jpl/src/m/classes/esa.m

@@ -44 +44 @@
                         md = checkfield(md,'fieldname','esa.love_h','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','esa.love_l','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','esa.hemisphere','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','esa.degacc','size',[1 1],'>=',1e-10);
                         md = checkfield(md,'fieldname','esa.requested_outputs','stringrow',1);

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

@@ -18 +18 @@
                 self.love_h            = 0 #provided by PREM model()
                 self.love_l            = 0 #ideam
+                self.hemisphere        = 0
                 self.degacc            = 0
                 self.requested_outputs = []
@@ -30 +31 @@
                         string="%s\n%s"%(string,fielddisplay(self,'love_h','load Love number for radial displacement'))
                         string="%s\n%s"%(string,fielddisplay(self,'love_l','load Love number for horizontal displaements'))
+                        string="%s\n%s"%(string,fielddisplay(self,'hemisphere','North-south, East-west components of 2-D horiz displacement vector: -1 south, 1 north'))
                         string="%s\n%s"%(string,fielddisplay(self,'degacc','accuracy (default .01 deg) for numerical discretization of the Green''s functions'))
                         string="%s\n%s"%(string,fielddisplay(self,'transitions','indices into parts of the mesh that will be icecaps'))
@@ -40 +42 @@
                 #numerical discretization accuracy
                 self.degacc=.01
-                
+        
+                #computational flags:
+                self.hemisphere=0;
+
                 #output default:
                 self.requested_outputs=['default']
@@ -60 +65 @@
                 md = checkfield(md,'fieldname','esa.love_h','NaN',1,'Inf',1)
                 md = checkfield(md,'fieldname','esa.love_l','NaN',1,'Inf',1)
+                md = checkfield(md,'fieldname','esa.hemisphere','NaN',1,'Inf',1)
                 md = checkfield(md,'fieldname','esa.degacc','size',[1,1],'>=',1e-10)
                 md = checkfield(md,'fieldname','esa.requested_outputs','stringrow',1)
@@ -75 +81 @@
                 WriteData(fid,prefix,'object',self,'fieldname','love_h','format','DoubleMat','mattype',1)
                 WriteData(fid,prefix,'object',self,'fieldname','love_l','format','DoubleMat','mattype',1)
+                WriteData(fid,prefix,'object',self,'fieldname','hemisphere','format','Integer')
                 WriteData(fid,prefix,'object',self,'fieldname','degacc','format','Double')
                 WriteData(fid,prefix,'object',self,'fieldname','transitions','format','MatArray')