Changeset 25712

Timestamp:

10/23/20 00:30:06 (4 years ago)

Author:

jdquinn

Message:

CHG: Reverting to PETSc 3.12 on Pine Island until 3.14 is viable (external package download issues); fix of check on md.results; clean up

Location:

issm/trunk-jpl

Files:

• jenkins/pine_island-mac (modified) (1 diff)
• jenkins/pine_island-mac-dakota (modified) (1 diff)
• jenkins/pine_island-mac-matlab (deleted)
• jenkins/pine_island-mac-python (modified) (1 diff)
• jenkins/pine_island-mac-solid_earth (modified) (1 diff)
• jenkins/ross-debian_linux-matlab (deleted)
• src/m/solve/loadresultsfromdisk.py (modified) (1 diff)

issm/trunk-jpl/jenkins/pine_island-mac

@@ -34 +34 @@
         autotools       install.sh
         cmake           install.sh
-        petsc           install-3.14-mac.sh
+        petsc           install-3.12-mac.sh
         triangle        install-mac.sh
         chaco           install.sh

issm/trunk-jpl/jenkins/pine_island-mac-dakota

@@ -40 +40 @@
         autotools               install.sh
         cmake                   install.sh
-        petsc                   install-3.14-mac.sh
+        petsc                   install-3.12-mac.sh
         gsl                             install.sh
         boost                   install-1.7-mac.sh

issm/trunk-jpl/jenkins/pine_island-mac-python

@@ -37 +37 @@
         autotools       install.sh
         cmake           install.sh
-        petsc           install-3.14-mac.sh
+        petsc           install-3.12-mac.sh
         gsl                     install.sh
         boost           install-1.7-mac.sh

issm/trunk-jpl/jenkins/pine_island-mac-solid_earth

@@ -40 +40 @@
         autotools               install.sh
         cmake                   install.sh
-        petsc                   install-3.14-mac.sh
+        petsc                   install-3.12-mac.sh
         gsl                             install.sh
         boost                   install-1.7-mac.sh

issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py

@@ -34 +34 @@
             raise OSError(err_msg)
 
-        # # Initialize md.results if not a structure yet
-        if not isinstance(md.results, struct):
+        # Initialize md.results if not a results structure yet
+        if not isinstance(md.results, results):
             md.results = results()