Changeset 26317

Timestamp:

06/11/21 04:44:59 (4 years ago)

Author:

kakajanto

Message:

BUG: Name change issues, SealevelRISE to SealevelCHANGE, and other python fixes

Location:

issm/trunk-jpl/src/m/classes

Files:

• dsl.py (modified) (1 diff)
• dslmme.py (modified) (1 diff)
• lovenumbers.py (modified) (4 diffs)
• matdamageice.py (modified) (1 diff)
• matenhancedice.py (modified) (1 diff)
• matestar.py (modified) (1 diff)
• nodalvalue.py (modified) (1 diff)
• rotational.py (modified) (1 diff)
• slr.py (modified) (2 diffs)
• solidearth.py (modified) (3 diffs)
• solidearthsettings.py (modified) (1 diff)
• solidearthsolution.m (modified) (1 diff)
• solidearthsolution.py (modified) (2 diffs)
• surfaceload.py (modified) (1 diff)

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

@@ -49 +49 @@
 
         if md.solidearth.settings.compute_bp_grd:
-            md = checkfield(md, 'fieldname', dsl.sea_water_pressure_at_sea_floor, 'empty', 1)
+            md = checkfield(md, 'fieldname', 'dsl.sea_water_pressure_at_sea_floor', 'empty', 1)
 
         return md

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

@@ -41 +41 @@
     def checkconsistency(self, md, solution, analyses):  # {{{
         # Early return
-        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
+        if ('SealevelchangeAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
             return md
 

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

@@ +1 @@
+import numpy as np
 from checkfield import checkfield
 from fielddisplay import fielddisplay
@@ -55 +56 @@
     def setdefaultparameters(self, maxdeg, referenceframe):  #{{{
         # Initialize love numbers
-        self.h = getlovenumbers('type', 'loadingverticaldisplacement', 'referenceframe', referenceframe, 'maxdeg', maxdeg)
-        self.k = getlovenumbers('type', 'loadinggravitationalpotential', 'referenceframe', referenceframe, 'maxdeg', maxdeg)
-        self.l = getlovenumbers('type', 'loadinghorizontaldisplacement', 'referenceframe', referenceframe, 'maxdeg', maxdeg)
-        self.th = getlovenumbers('type', 'tidalverticaldisplacement', 'referenceframe', referenceframe, 'maxdeg', maxdeg)
-        self.tk = getlovenumbers('type', 'tidalgravitationalpotential', 'referenceframe', referenceframe, 'maxdeg', maxdeg)
-        self.tl = getlovenumbers('type', 'tidalhorizontaldisplacement', 'referenceframe', referenceframe, 'maxdeg', maxdeg)
+        self.h = getlovenumbers('type', 'loadingverticaldisplacement', 'referenceframe', referenceframe, 'maxdeg', maxdeg).reshape(-1,1)
+        self.k = getlovenumbers('type', 'loadinggravitationalpotential', 'referenceframe', referenceframe, 'maxdeg', maxdeg).reshape(-1,1)
+        self.l = getlovenumbers('type', 'loadinghorizontaldisplacement', 'referenceframe', referenceframe, 'maxdeg', maxdeg).reshape(-1,1)
+        self.th = getlovenumbers('type', 'tidalverticaldisplacement', 'referenceframe', referenceframe, 'maxdeg', maxdeg).reshape(-1,1)
+        self.tk = getlovenumbers('type', 'tidalgravitationalpotential', 'referenceframe', referenceframe, 'maxdeg', maxdeg).reshape(-1,1)
+        self.tl = getlovenumbers('type', 'tidalhorizontaldisplacement', 'referenceframe', referenceframe, 'maxdeg', maxdeg).reshape(-1,1)
 
         # Secular fluid love number
@@ -67 +68 @@
         # Time
         self.istime = 1 # Temporal love numbers by default
-        self.timefreq = 0 # Elastic case by default
+        self.timefreq = np.zeros(1) # Elastic case by default
         return self
     #}}}
@@ -89 +90 @@
 
         ntf = len(self.timefreq)
-        if (self.h.shape[1] != ntf or self.k.shape[1] != ntf or self.l.shape[1] != ntf or self.th.shape[1] != ntf or self.tk.shape[1] != ntf or self.tl.shape[1] != ntf):
+        if (np.shape(self.h)[1] != ntf or np.shape(self.k)[1] != ntf or np.shape(self.l)[1] != ntf or np.shape(self.th)[1] != ntf or np.shape(self.tk)[1] != ntf or np.shape(self.tl)[1] != ntf):
             raise ValueError('lovenumbers error message: love numbers should have as many time/frequency steps as the time/frequency vector')
 

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

@@ -115 +115 @@
         md = checkfield(md, 'fieldname', 'materials.effectiveconductivity_averaging', 'numel', [1], 'values', [0, 1, 2])
 
-        if 'SealevelriseAnalysis' in analyses:
+        if 'SealevelchangeAnalysis' in analyses:
                 md = checkfield(md, 'fieldname', 'materials.earth_density', '>', 0, 'numel', 1)
 

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

@@ -126 +126 @@
         md = checkfield(md, 'fieldname', 'materials.effectiveconductivity_averaging', 'numel', [1], 'values', [0, 1, 2])
 
-        if 'SealevelriseAnalysis' in analyses:
+        if 'SealevelchangeAnalysis' in analyses:
             md = checkfield(md, 'fieldname', 'materials.earth_density', '>', 0, 'numel', 1)
         return md

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

@@ -120 +120 @@
         md = checkfield(md, 'fieldname', 'materials.effectiveconductivity_averaging', 'numel', [1], 'values', [0, 1, 2])
 
-        if 'SealevelriseAnalysis' in analyses:
+        if 'SealevelchangeAnalysis' in analyses:
             md = checkfield(md, 'fieldname', 'materials.earth_density', '>', 0, 'numel', 1)
 

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

@@ -12 +12 @@
         nodalvalue=nodalvalue()
         nodalvalue=nodalvalue(
-            'name', 'SealevelriseSNodalValue',
+            'name', 'SealevelchangeSNodalValue',
             'definitionstring', 'Outputdefinition1',
-            'model_string', 'SealevelriseS',
+            'model_string', 'SealevelchangeS',
             'node', 1
         )

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

@@ -42 +42 @@
 
     def checkconsistency(self, md, solution, analyses):  # {{{
-        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
+        if ('SealevelchangeAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
             return md
         md = checkfield(md, 'fieldname', 'solidearth.rotational.equatorialmoi', 'NaN', 1, 'Inf', 1)

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

@@ -7 +7 @@
 from planetradius import planetradius
 from WriteData import WriteData
+from project3d import project3d
 
 
@@ -120 +121 @@
     def checkconsistency(self, md, solution, analyses):  # {{{
         # Early return
-        if 'SealevelriseAnalysis' not in analyses or (solution == 'TransientSolution' and not md.transient.isslr):
+        if 'SealevelchangeAnalysis' not in analyses or (solution == 'TransientSolution' and not md.transient.isslr):
             return md
 

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

@@ -8 +8 @@
 from rotational import rotational
 from solidearthsettings import solidearthsettings
+from solidearthsolution import solidearthsolution
+from offlinesolidearthsolution import offlinesolidearthsolution
 from surfaceload import surfaceload
 from WriteData import WriteData
@@ -79 +81 @@
     #}}}
     def checkconsistency(self, md, solution, analyses): #{{{
-        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
+        if ('SealevelchangeAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
             return md
 
@@ -88 +90 @@
         self.rotational.checkconsistency(md, solution, analyses)
         if self.external:
-            if not isinstance(self.external, 'solidearthsolution'):
+            if (not isinstance(self.external,solidearthsolution)) and (not isinstance(self.external,offlinesolidearthsolution)):
                 raise Exception('solidearth consistency check: external field should be a solidearthsolution')
-            end
             self.external.checkconsistency(md, solution, analyses)
         return md

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

@@ -98 +98 @@
 
     def checkconsistency(self, md, solution, analyses): #{{{
-        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
+        if ('SealevelchangeAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
             return md
 

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

@@ -66 +66 @@
                                 geoid_rate(end+1,:)=time(1:end-1);
                         end
+
+                        WriteData(fid, prefix, 'name', 'md.solidearth.external.nature', 'data', 0, 'format', 'Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','displacementeast','data',displacementeast_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementeast','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts);
                         WriteData(fid,prefix,'object',self,'fieldname','displacementup','data',displacementup_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementup','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts);

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

@@ -53 +53 @@
 
         # Transform our time series into time series rates
-        if np.shape(self.displacementeast, 1) == 1:
+        if len(np.shape(self.displacementeast)) == 1:
             print('External solidearthsolution warning: only one time step provided, assuming the values are rates per year')
             displacementeast_rate = np.append(np.array(self.displacementeast).reshape(-1, 1), 0)
@@ -61 +61 @@
         else:
             time = self.displacementeast[-1, :]
-            dt = np.diff(time, 1, 1)
+            dt = np.diff(time, axis=0)
             displacementeast_rate = np.diff(self.displacementeast[0:-2, :], 1, 1) / dt
-            displacementeast_rate.append(time[0:-2])
+            displacementeast_rate = np.append(displacementeast_rate,time[:-1].reshape(1,-1),axis=0)
             displacementnorth_rate = np.diff(self.displacementnorth[0:-2, :], 1, 1) / dt
-            displacementnorth_rate.append(time[0:-2])
+            displacementnorth_rate = np.append(displacementnorth_rate,time[:-1].reshape(1,-1),axis=0)
             displacementup_rate = np.diff(self.displacementup[0:-2, :], 1, 1) / dt
-            displacementup_rate.append(time[0:-2])
+            displacementup_rate = np.append(displacementup_rate,time[:-1].reshape(1,-1),axis=0)
             geoid_rate = np.diff(self.geoid[0:-2, :], 1, 1) / dt
-            geoid_rate.append(time[0:-2])
+            geoid_rate = np.append(geoid_rate,time[:-1].reshape(1,-1),axis=0)
+
+        WriteData(fid, prefix, 'name', 'md.solidearth.external.nature', 'data', 0, 'format', 'Integer')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'displacementeast', 'data', displacementeast_rate, 'format', 'DoubleMat', 'name', 'md.solidearth.external.displacementeast', 'mattype', 1, 'scale', 1 / yts,'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts);
         WriteData(fid, prefix, 'object', self, 'fieldname', 'displacementup', 'data', displacementup_rate,'format', 'DoubleMat', 'name', 'md.solidearth.external.displacementup', 'mattype', 1, 'scale', 1 / yts,'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts);

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

@@ -39 +39 @@
 
     def checkconsistency(self, md, solution, analyses):  # {{{
-        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
+        if ('SealevelchangeAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
             return md
         if type(self.icethicknesschange) == np.ndarray: