Changeset 27115

Timestamp:

06/29/22 03:29:22 (3 years ago)

Author:

bdef

Message:

CHG: Syntax and matlab consistency fixes

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test2002.py (modified) (2 diffs)
• test2006.py (modified) (3 diffs)
• test417.py (modified) (1 diff)
• test440.py (modified) (1 diff)
• test446.py (modified) (1 diff)

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

@@ -11 +11 @@
 
 
+# Mesh earth
+#
+# NOTE: In MATLAB, we currently use cached mesh to account for differences in
+# mesh generated under Linux versus under macOS
+#
 md = model()
 
-## Generate and save mesh (need to uncomment import of gmshplanet as well)
+# 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:
@@ -60 +65 @@
 
 icemask = np.ones((md.mesh.numberofvertices, ))
-# NOTE: Need to be careful here: when using multidimensional array elements to 
+# NOTE: Need to be careful here: when using multidimensional array elements to
 # address a one-dimensional array in MATLAB, only first column is used
 #

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

@@ -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
@@ -163 +164 @@
 for i in range(len(locations)):
     if i == 0:
-        md.outputdefinition.definitions = [
-            nodalvalue(
-                'name',             'SNode',
-                'definitionstring', 'Outputdefinition1',
-                'model_string',     'Sealevel',
-                'node',             locations[i]
-            )
-        ]
+        md.outputdefinition.definitions = [nodalvalue('name', 'SNode',
+                                                      'definitionstring', 'Outputdefinition1',
+                                                      'model_string', 'Sealevel',
+                                                      'node', locations[i])]
     else:
         md.outputdefinition.definitions.append(
-            nodalvalue(
-                'name',             'SNode',
-                'definitionstring', 'Outputdefinition' + str(i + 1),
-                'model_string',     'Sealevel',
-                'node',             locations[i]
-            )
-        )
+            nodalvalue('name', 'SNode',
+                       'definitionstring', 'Outputdefinition' + str(i + 1),
+                       'model_string', 'Sealevel',
+                       'node', locations[i]))
 #}}}
 
 # Algorithm #{{{
 md.qmu.method = dakota_method.dakota_method('nond_samp')
-md.qmu.method = dmeth_params_set(
-    md.qmu.method,
-    'seed',             1234,
-    'samples',          10,
-    'sample_type',      'random'
-)
+md.qmu.method = dmeth_params_set(md.qmu.method,
+                                 'seed', 1234,
+                                 'samples', 10,
+                                 'sample_type', 'random')
 md.qmu.output = 1
 #}}}
@@ -235 +227 @@
 
 # Compare statistics with our own here
-svalues = mds.results.StatisticsSolution[-1].SealevelSamples # all values at locations
+svalues = mds.results.StatisticsSolution[-1].SealevelSamples  # all values at locations
 
 dvalues = np.zeros((md.qmu.method.params.samples, len(locations)))

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

@@ -41 +41 @@
     'mean', np.ones((npart, 1)),
     'stddev', .01 * np.ones((npart, 1)),
-    'partition', partition
-    )
+    'partition', partition)
 
 #responses
-md.qmu.responses.MaxVel = response_function.response_function('descriptor','MaxVel')
-md.qmu.responses.IceVolume = response_function.response_function('descriptor','IceVolume')
-md.qmu.responses.MassFlux1 = response_function.response_function('descriptor','indexed_MassFlux_1')
-md.qmu.responses.MassFlux2 = response_function.response_function('descriptor','indexed_MassFlux_2')
-md.qmu.responses.MassFlux3 = response_function.response_function('descriptor','indexed_MassFlux_3')
-md.qmu.responses.MassFlux4 = response_function.response_function('descriptor','indexed_MassFlux_4')
-md.qmu.responses.MassFlux5 = response_function.response_function('descriptor','indexed_MassFlux_5')
-md.qmu.responses.massFlux6 = response_function.response_function('descriptor','indexed_MassFlux_6')
-md.qmu.responses.massFlux7 = response_function.response_function('descriptor','indexed_MassFlux_7')
+md.qmu.responses.MaxVel = response_function.response_function('descriptor', 'MaxVel')
+#md.qmu.responses.IceVolume = response_function.response_function('descriptor', 'IceVolume')  #commented for matlab consistency
+md.qmu.responses.MassFlux1 = response_function.response_function('descriptor', 'indexed_MassFlux_1')
+md.qmu.responses.MassFlux2 = response_function.response_function('descriptor', 'indexed_MassFlux_2')
+md.qmu.responses.MassFlux3 = response_function.response_function('descriptor', 'indexed_MassFlux_3')
+md.qmu.responses.MassFlux4 = response_function.response_function('descriptor', 'indexed_MassFlux_4')
+md.qmu.responses.MassFlux5 = response_function.response_function('descriptor', 'indexed_MassFlux_5')
+md.qmu.responses.massFlux6 = response_function.response_function('descriptor', 'indexed_MassFlux_6')
+md.qmu.responses.massFlux7 = response_function.response_function('descriptor', 'indexed_MassFlux_7')
 
 #mass flux profiles

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

@@ -30 +30 @@
 
 #variables
-md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain(
-    'descriptor', 'MaterialsRhoIce',
-    'mean', 1,
-    'stddev', 0.01
-    )
+md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain('descriptor', 'MaterialsRhoIce',
+                                                             'mean', 1,
+                                                             'stddev', 0.01)
 
 #responses
-md.qmu.responses.MaxVel = response_function.response_function(
-    'descriptor', 'scaled_Thickness',
-    'partition', partition
-    )
+md.qmu.responses.MaxVel = response_function.response_function('descriptor', 'scaled_Thickness',
+                                                              'partition', partition)
 
 #method

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

@@ -15 +15 @@
 md.cluster = generic('name', gethostname(), 'np', 3)
 md.stressbalance.requested_outputs = ['default', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase']
-md = SetMOLHOBC(md);
+md = SetMLHOBC(md)
 md = solve(md, 'Stressbalance')