Changeset 26842

Timestamp:

01/31/22 17:18:22 (3 years ago)

Author:

jdquinn

Message:

CHG: Precomputed Gmsh mesh for Python SE tests written out to Pickle file; updated precomputed mesh for MATLAB; updated corresponding archives again from Linux machine

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive2002.arch (modified) ( previous)
• Archives/Archive2003.arch (modified) ( previous)
• Archives/Archive2005.arch (modified) ( previous)
• Archives/Archive2010.arch (modified) ( previous)
• Archives/Archive2101.arch (modified) ( previous)
• Data/SlcTestMesh.mat (modified) ( previous)
• Data/SlcTestMesh.pkl (added)
• NightlyRun/test2002.m (modified) (1 diff)
• NightlyRun/test2002.py (modified) (2 diffs)
• NightlyRun/test2003.py (modified) (2 diffs)
• NightlyRun/test2005.py (modified) (2 diffs)
• NightlyRun/test2006.py (modified) (2 diffs)
• NightlyRun/test2010.py (modified) (2 diffs)
• NightlyRun/test2101.py (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/test2002.m

@@ -3 +3 @@
 %mesh earth:
 md=model;
-load ../Data/SlcTestMesh.mat;
+
+% %Generate and save mesh
+% SlcMesh=gmshplanet('radius',6.371012*10^3,'resolution',700.);
+% save('../Data/SlcTestMesh.mat','SlcMesh');
+% md.mesh=SlcMesh;
+
+%Load precomputed mesh
+load('../Data/SlcTestMesh.mat');
 md.mesh=SlcMesh; %700 km resolution mesh
 

issm/trunk-jpl/test/NightlyRun/test2002.py

@@ -1 +1 @@
 #Test Name: EarthSlc
 import numpy as np
-
-from gmshplanet import *
+import pickle
+#from gmshplanet import *
 from gmtmask import *
 from lovenumbers import *
@@ -12 +12 @@
 
 md = model()
-md.mesh = gmshplanet('radius', 6.371012 * 1e3, 'resolution', 700.) # 700 km resolution mesh
+
+## Generate and save mesh (need to uncomment import of gmshplanet as well)
+# md.mesh = gmshplanet('radius', 6.371012 * 1e3, 'resolution', 700.) # 700 km resolution mesh
+# with open('../Data/SlcTestMesh.pkl', 'wb') as slc_test_mesh_file:
+#     pickle.dump(md.mesh, slc_test_mesh_file)
+
+# Load precomputed mesh
+with open('../Data/SlcTestMesh.pkl', 'rb') as slc_test_mesh_file:
+    md.mesh = pickle.load(slc_test_mesh_file)
 
 # Geometry for the bed, arbitrary thickness of 100

issm/trunk-jpl/test/NightlyRun/test2003.py

@@ -1 +1 @@
 #Test Name: EarthSlc_rotationalFeedback
 import numpy as np
+import pickle
 from socket import gethostname
-from gmshplanet import *
 from gmtmask import *
 from lovenumbers import *
@@ -12 +12 @@
 
 md = model()
-md.mesh = gmshplanet('radius', 6.371012 * 1e3, 'resolution', 700.) # 700 km resolution mesh
+
+# Load precomputed mesh
+with open('../Data/SlcTestMesh.pkl', 'rb') as slc_test_mesh_file:
+    md.mesh = pickle.load(slc_test_mesh_file)
 
 # Geometry for the bed, arbitrary thickness of 100

issm/trunk-jpl/test/NightlyRun/test2005.py

@@ -1 +1 @@
 #Test Name: EarthSlc
 import numpy as np
-
-from gmshplanet import *
+import pickle
 from gmtmask import *
 from lovenumbers import *
@@ -14 +13 @@
 # Mesh earth
 md = model()
-md.mesh = gmshplanet('radius', 6.371012 * 1e3, 'resolution', 700.) #700 km resolution mesh
+
+# Load precomputed mesh
+with open('../Data/SlcTestMesh.pkl', 'rb') as slc_test_mesh_file:
+    md.mesh = pickle.load(slc_test_mesh_file)
 
 # Geometry for the bed, arbitrary thickness of 100

issm/trunk-jpl/test/NightlyRun/test2006.py

@@ -1 +1 @@
 #Test Name: EarthSlc Dakota Sampling glaciers
 import numpy as np
+import pickle
 from socket import gethostname
 from dmeth_params_set import *
-from gmshplanet import *
 from gmtmask import *
 from lovenumbers import *
@@ -18 +18 @@
 md = model()
 md.cluster = generic('name', gethostname(), 'np', 5)
-md.mesh = gmshplanet('radius', 6.371012 * 1e3, 'resolution', 700.) #700 km resolution mesh
+
+# Load precomputed mesh
+with open('../Data/SlcTestMesh.pkl', 'rb') as slc_test_mesh_file:
+    md.mesh = pickle.load(slc_test_mesh_file)
 
 # Geometry for the bed, arbitrary thickness of 100

issm/trunk-jpl/test/NightlyRun/test2010.py

@@ -1 +1 @@
 #Test Name: MomentOfIntertia
 import numpy as np
+import pickle
 from socket import gethostname
-from gmshplanet import *
 from gmtmask import *
 from lovenumbers import *
@@ -12 +12 @@
 # Mesh earth
 md = model()
-md.mesh = gmshplanet('radius', 6.371012 * 1e3, 'resolution', 700.) #700 km resolution mesh
+
+# Load precomputed mesh
+with open('../Data/SlcTestMesh.pkl', 'rb') as slc_test_mesh_file:
+    md.mesh = pickle.load(slc_test_mesh_file)
 
 # Geometry for the bed, arbitrary thickness of 100

issm/trunk-jpl/test/NightlyRun/test2101.py

@@ -1 +1 @@
 #Test Name: EarthEsa
 #Elastostatic adjustment for an elemental ice unloading
+import numpy as np
+import pickle
 from socket import gethostname
-
-import numpy as np
-
-from gmshplanet import *
 from gmtmask import *
 from lovenumbers import *
@@ -15 +13 @@
 #mesh earth:
 md = model()
-md.mesh = gmshplanet('radius', 6.371012 * 1e3, 'resolution', 700)
+
+# Load precomputed mesh
+with open('../Data/SlcTestMesh.pkl', 'rb') as slc_test_mesh_file:
+    md.mesh = pickle.load(slc_test_mesh_file)
 
 #define load