Index: ../trunk-jpl/src/m/classes/solidearthsettings.py =================================================================== --- ../trunk-jpl/src/m/classes/solidearthsettings.py (revision 25765) +++ ../trunk-jpl/src/m/classes/solidearthsettings.py (revision 25766) @@ -22,6 +22,7 @@ self.ocean_area_scaling = 0 self.runfrequency = 1 # How many time steps we skip before we run grd_core self.computesealevelchange = 0 # Will grd_core compute sea level? + self.isgrd = 1 # Will GRD patterns be computed? self.degacc = 0 # Degree increment for resolution of Green tables self.horiz = 0 # Compute horizontal displacement? self.glfraction = 1 # Barystatic contribution: full or fractional (default: fractional) @@ -41,6 +42,7 @@ s += '{}\n'.format(fielddisplay(self, 'maxiter', 'maximum number of nonlinear iterations')) s += '{}\n'.format(fielddisplay(self, 'ocean_area_scaling', 'correction for model representation of ocean area [default: No correction]')) s += '{}\n'.format(fielddisplay(self, 'computesealevelchange', 'compute sealevel change from GRD in addition to steric?) default 0')) + s += '{}\n'.format(fielddisplay(self, 'isgrd', 'compute GRD patterns (default: 1')) s += '{}\n'.format(fielddisplay(self, 'runfrequency', 'how many time steps we skip before we run solidearthsettings solver during transient (default: 1)')) s += '{}\n'.format(fielddisplay(self, 'rigid', 'rigid earth graviational potential perturbation')) s += '{}\n'.format(fielddisplay(self, 'elastic', 'elastic earth graviational potential perturbation')) @@ -62,6 +64,7 @@ self.elastic = 1 self.rotation = 1 self.ocean_area_scaling = 0 + self.isgrd = 1 self.computesealevelchange = 0 # Numerical discretization accuracy @@ -89,7 +92,7 @@ md = checkfield(md, 'fieldname', 'solidearth.settings.glfraction', 'values', [0, 1]) # A coupler to planet model is provided - if self.computesealevelchange: + if self.isgrd: if md.transient.iscoupler: # We are good pass @@ -114,6 +117,7 @@ WriteData(fid, prefix, 'object', self, 'fieldname', 'degacc', 'name', 'md.solidearth.settings.degacc', 'format', 'Double') WriteData(fid, prefix, 'object', self, 'fieldname', 'horiz', 'name', 'md.solidearth.settings.horiz', 'format', 'Integer') WriteData(fid, prefix, 'object', self, 'fieldname', 'computesealevelchange', 'name', 'md.solidearth.settings.computesealevelchange', 'format', 'Integer') + WriteData(fid, prefix, 'object', self, 'fieldname','isgrd', 'name', 'md.solidearth.settings.isgrd', 'format', 'Integer') WriteData(fid, prefix, 'object', self, 'fieldname','glfraction', 'name', 'md.solidearth.settings.glfraction', 'format', 'Integer') #}}}