source: issm/oecreview/Archive/21724-22754/ISSM-22351-22352.diff@ 22755

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

@@ -43 +43 @@
                         md = checkfield(md,'fieldname','esa.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
                         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);
 

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

@@ -17 +17 @@
                 self.deltathickness    = float('NaN')
                 self.love_h            = 0 #provided by PREM model()
                 self.love_l            = 0 #ideam
+                self.hemisphere        = 0
                 self.degacc            = 0
                 self.requested_outputs = []
                 self.transitions       = []
@@ -29 +30 @@
                         string="%s\n%s"%(string,fielddisplay(self,'deltathickness','thickness change: ice height equivalent [m]'))
                         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'))
                         string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','additional outputs requested (default: EsaUmotion)'))
@@ -39 +41 @@
                 
                 #numerical discretization accuracy
                 self.degacc=.01
-                
+        
+                #computational flags:
+                self.hemisphere=0;
+
                 #output default:
                 self.requested_outputs=['default']
 
@@ -59 +64 @@
                 md = checkfield(md,'fieldname','esa.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements,1])
                 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)
 
@@ -74 +80 @@
                 WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',2)
                 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')
         

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

@@ -9 +9 @@
                 
                 //numerical discretization accuracy
                 this.degacc=.01;
-                
+        
+                //computational flags:
+                this.hemisphere=0;
+
                 //output default:
                 this.requested_outputs=['default'];
 
@@ -25 +28 @@
                         md = checkfield(md,'fieldname','esa.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements, 1]);
                         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);
                         
@@ -47 +51 @@
                 fielddisplay(this,'deltathickness','thickness change: ice height equivalent [m]');
                 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');
                 fielddisplay(this,'requested_outputs','additional outputs requested (default: EsaUmotion)');
@@ -56 +61 @@
                         WriteData(fid,prefix,'object',this,'fieldname','deltathickness','format','DoubleMat','mattype',2);
                         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');
 
@@ -74 +80 @@
                         this.deltathickness=NullFix(this.deltathickness,NaN);
                         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);
                 }//}}}
         //properties
@@ -81 +88 @@
         this.deltathickness = NaN;
         this.love_h         = 0; //provided by PREM model
         this.love_l         = 0; //idam
+        this.hemisphere     = 0;
         this.degacc         = 0;
         this.requested_outputs = [];
         this.transitions    = [];