Changeset 27131 for issm/trunk-jpl/src/m/classes/solidearthsettings.m

Timestamp:

07/01/22 15:15:14 (3 years ago)

Author:

caronlam

Message:

CHG: Memory and runtime optimization of sealevelchange core.

File:

• issm/trunk-jpl/src/m/classes/solidearthsettings.m (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/solidearthsettings.m ¶

@@ -20 +20 @@
                 compute_bp_grd         = 0; %will GRD patterns for bottom pressures be computed? 
                 degacc                 = 0; %degree increment for resolution of Green tables.
-                timeacc                = 0; %time step accuracy required to compute Green tables
+                timeacc                = 1; %time step accuracy required to compute Green tables
                 horiz                  = 0; %compute horizontal deformation
-                grdmodel               = 0; %grd model (0 by default, 1 for (visco-)elastic, 2 for Ivins)
+                grdmodel               = 1; %grd model (0 by default, 1 for (visco-)elastic, 2 for Ivins)
                 cross_section_shape    = 0; %cross section only used when grd model is Ivins
         end
@@ -89 +89 @@
 
                         %no grd model by default:
-                        self.grdmodel=0;
+                        self.grdmodel=1;
 
                 end % }}}
                 function disp(self) % {{{
                         disp(sprintf('   solidearth settings:'));
-
-                        fielddisplay(self,'reltol','sea level change relative convergence criterion (default, NaN: not applied)');
-                        fielddisplay(self,'abstol','sea level change absolute convergence criterion(default, NaN: not applied)');
-                        fielddisplay(self,'maxiter','maximum number of nonlinear iterations');
-                        fielddisplay(self,'grdocean','does this planet have an ocean, if set to 1: global water mass is conserved in GRD module (default: 1)'); 
-                        fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area (default: No correction)'); 
-                        fielddisplay(self,'sealevelloading','enables surface loading from sea-level change (default: 1)');
+                        disp(sprintf('      core:'));
                         fielddisplay(self,'isgrd','compute GRD patterns (default: 1)');
-                        fielddisplay(self,'compute_bp_grd','compute GRD patterns for bottom pressure loads (default: 1)');
-                        fielddisplay(self,'runfrequency','how many time steps we skip before we run solidearthsettings solver during transient (default: 1)');
+                        fielddisplay(self,'grdmodel','type of deformation model, 0 for no GRD, 1 for spherical GRD model (SESAW model), 2 for half-space planar GRD (visco-elastic model from Ivins)');
+                        fielddisplay(self,'runfrequency','How many time steps we let masstransport core accumulate changes before each run of the sealevelchange core (default: 1, i.e run slc every time step)');
+                        disp(sprintf('      computational flags:'));
                         fielddisplay(self,'selfattraction','enables surface mass load to perturb the gravity field');
                         fielddisplay(self,'elastic','enables elastic deformation from surface loading');
                         fielddisplay(self,'viscous','enables viscous deformation from surface loading');
                         fielddisplay(self,'rotation','enables polar motion to feedback on the GRD fields');
-                        fielddisplay(self,'degacc','accuracy (default: .01 deg) for numerical discretization of the Green''s functions');
+                        fielddisplay(self,'compute_bp_grd','compute GRD patterns for bottom pressure loads (default: 1)');
+                        fielddisplay(self,'cross_section_shape','1: square-edged (default). 2: elliptical. See iedge in GiaDeflectionCore. Used only for grdmodel=2 only');
+                        disp(sprintf('      resolution:'));
+                        fielddisplay(self,'degacc','spatial accuracy (default: .01 deg) for numerical discretization of the Green''s functions');
                         fielddisplay(self,'timeacc','time accuracy (default: 1 yr) for numerical discretization of the Green''s functions');
-                        fielddisplay(self,'grdmodel','type of deformation model, 0 for no GRD, 1 for spherical GRD model (SESAW model), 2 for half-space planar GRD (visco-elastic model from Ivins)');
-                        fielddisplay(self,'cross_section_shape','1: square-edged (default). 2: elliptical. See iedge in GiaDeflectionCore');
+                        disp(sprintf('      sea-level equation:'));
+                        fielddisplay(self,'grdocean','does this planet have an ocean, if set to 1: global water mass is conserved in GRD module (default: 1)'); 
+                        fielddisplay(self,'sealevelloading','enables surface loading from sea-level change (default: 1)');
+                        fielddisplay(self,'maxiter','maximum number of nonlinear iterations');
+                        fielddisplay(self,'reltol','sea level change relative convergence criterion (default, NaN: not applied)');
+                        fielddisplay(self,'abstol','sea level change absolute convergence criterion(default, NaN: not applied)');
+                        fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area (default: No correction)'); 
+
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -133 +137 @@
                         if self.viscous==1 & self.elastic==0,
                                 error('solidearthsettings checkconsistency error message: need elastic on if viscous flag is set');
+                        end
+                        if self.rotation==1 & self.elastic==0,
+                                error('solidearthsettings checkconsistency error message: need elastic on if rotation flag is set');
                         end
 
@@ -164 +171 @@
                         WriteData(fid,prefix,'object',self,'fieldname','viscous','name','md.solidearth.settings.viscous','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','rotation','name','md.solidearth.settings.rotation','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'fieldname','rotation','name','md.solidearth.settings.satellitegravity','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','grdocean','name','md.solidearth.settings.grdocean','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','ocean_area_scaling','name','md.solidearth.settings.ocean_area_scaling','format','Boolean');
@@ -187 +195 @@
                         writejsdouble(fid,[modelname '.solidearth.settings.viscous'],self.viscous);
                         writejsdouble(fid,[modelname '.solidearth.settings.rotation'],self.rotation);
-                        writejsdouble(fid,[modelname '.solidearth.settings.grdocean'],self.rotation);
+                        writejsdouble(fid,[modelname '.solidearth.settings.grdocean'],self.grdocean);
                         writejsdouble(fid,[modelname '.solidearth.settings.ocean_area_scaling'],self.ocean_area_scaling);
                         writejsdouble(fid,[modelname '.solidearth.settings.run_frequency'],self.run_frequency);