Changeset 26804

Timestamp:

01/21/22 21:43:56 (3 years ago)

Author:

jdquinn

Message:

BUG: Better check on macOS version; yts was not defined in marshall method

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/m/classes/calvingvonmises.py (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -210 +210 @@
         SYSTEM_FMEMOPEN=1
         if test "${IS_MAC}" == "yes"; then
-                if [[ $(system_profiler SPSoftwareDataType | grep "System Version:" | sed -e "s/[[:space:]]*System Version: macOS //" | cut -d "." -f 2) -lt 13 ]]; then
+                sys_ver=$(sw_vers -productVersion)
+                if [[ $(echo ${sys_ver} | cut -d "." -f 1) -eq 10 && $(echo ${sys_ver} | cut -d "." -f 2) -eq 13 ]]; then
                         SYSTEM_FMEMOPEN=0
                 fi

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

@@ -56 +56 @@
 
     def marshall(self, prefix, md, fid):  # {{{
+        yts = md.constants.yts
         WriteData(fid, prefix, 'name', 'md.calving.law', 'data', 2, 'format', 'Integer')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'stress_threshold_groundedice', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts )