[25834] | 1 | Index: ../trunk-jpl/src/m/classes/solidearthsettings.py
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/m/classes/solidearthsettings.py (revision 25765)
|
---|
| 4 | +++ ../trunk-jpl/src/m/classes/solidearthsettings.py (revision 25766)
|
---|
| 5 | @@ -22,6 +22,7 @@
|
---|
| 6 | self.ocean_area_scaling = 0
|
---|
| 7 | self.runfrequency = 1 # How many time steps we skip before we run grd_core
|
---|
| 8 | self.computesealevelchange = 0 # Will grd_core compute sea level?
|
---|
| 9 | + self.isgrd = 1 # Will GRD patterns be computed?
|
---|
| 10 | self.degacc = 0 # Degree increment for resolution of Green tables
|
---|
| 11 | self.horiz = 0 # Compute horizontal displacement?
|
---|
| 12 | self.glfraction = 1 # Barystatic contribution: full or fractional (default: fractional)
|
---|
| 13 | @@ -41,6 +42,7 @@
|
---|
| 14 | s += '{}\n'.format(fielddisplay(self, 'maxiter', 'maximum number of nonlinear iterations'))
|
---|
| 15 | s += '{}\n'.format(fielddisplay(self, 'ocean_area_scaling', 'correction for model representation of ocean area [default: No correction]'))
|
---|
| 16 | s += '{}\n'.format(fielddisplay(self, 'computesealevelchange', 'compute sealevel change from GRD in addition to steric?) default 0'))
|
---|
| 17 | + s += '{}\n'.format(fielddisplay(self, 'isgrd', 'compute GRD patterns (default: 1'))
|
---|
| 18 | s += '{}\n'.format(fielddisplay(self, 'runfrequency', 'how many time steps we skip before we run solidearthsettings solver during transient (default: 1)'))
|
---|
| 19 | s += '{}\n'.format(fielddisplay(self, 'rigid', 'rigid earth graviational potential perturbation'))
|
---|
| 20 | s += '{}\n'.format(fielddisplay(self, 'elastic', 'elastic earth graviational potential perturbation'))
|
---|
| 21 | @@ -62,6 +64,7 @@
|
---|
| 22 | self.elastic = 1
|
---|
| 23 | self.rotation = 1
|
---|
| 24 | self.ocean_area_scaling = 0
|
---|
| 25 | + self.isgrd = 1
|
---|
| 26 | self.computesealevelchange = 0
|
---|
| 27 |
|
---|
| 28 | # Numerical discretization accuracy
|
---|
| 29 | @@ -89,7 +92,7 @@
|
---|
| 30 | md = checkfield(md, 'fieldname', 'solidearth.settings.glfraction', 'values', [0, 1])
|
---|
| 31 |
|
---|
| 32 | # A coupler to planet model is provided
|
---|
| 33 | - if self.computesealevelchange:
|
---|
| 34 | + if self.isgrd:
|
---|
| 35 | if md.transient.iscoupler:
|
---|
| 36 | # We are good
|
---|
| 37 | pass
|
---|
| 38 | @@ -114,6 +117,7 @@
|
---|
| 39 | WriteData(fid, prefix, 'object', self, 'fieldname', 'degacc', 'name', 'md.solidearth.settings.degacc', 'format', 'Double')
|
---|
| 40 | WriteData(fid, prefix, 'object', self, 'fieldname', 'horiz', 'name', 'md.solidearth.settings.horiz', 'format', 'Integer')
|
---|
| 41 | WriteData(fid, prefix, 'object', self, 'fieldname', 'computesealevelchange', 'name', 'md.solidearth.settings.computesealevelchange', 'format', 'Integer')
|
---|
| 42 | + WriteData(fid, prefix, 'object', self, 'fieldname','isgrd', 'name', 'md.solidearth.settings.isgrd', 'format', 'Integer')
|
---|
| 43 | WriteData(fid, prefix, 'object', self, 'fieldname','glfraction', 'name', 'md.solidearth.settings.glfraction', 'format', 'Integer')
|
---|
| 44 | #}}}
|
---|
| 45 |
|
---|