Changeset 26584

Timestamp:

11/10/21 00:06:09 (3 years ago)

Author:

bdef

Message:

BUG:fix to MLHOBC and test127

Location:

issm/trunk-jpl

Files:

• src/m/boundaryconditions/SetMLHOBC.py (modified) (2 diffs)
• test/NightlyRun/test127.py (modified) (4 diffs)

issm/trunk-jpl/src/m/boundaryconditions/SetMLHOBC.py ¶

@@ -1 @@
-import os
-import MatlabFuncs as m
+import numpy as np
 
 
@@ -18 +17 @@
     md.stressbalance.spcvx_base = md.stressbalance.spcvx
     md.stressbalance.spcvy_base = md.stressbalance.spcvy
-    md.stressbalance.spcvx_shear = float('nan') * md.stressbalance.spcvx
-    md.stressbalance.spcvy_shear = float('nan') * md.stressbalance.spcvy 
+    md.stressbalance.spcvx_shear = np.nan * md.stressbalance.spcvx
+    md.stressbalance.spcvy_shear = np.nan * md.stressbalance.spcvy
+
+    return md

issm/trunk-jpl/test/NightlyRun/test127.py ¶

@@ -2 +2 @@
 from model import *
 from socket import gethostname
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
 from massfluxatgate import massfluxatgate
 from generic import generic
+from SetMLHOBC import SetMLHOBC
 
 md = triangle(model(), '../Exp/Square.exp', 50000)
@@ -17 +18 @@
 #outputs
 #FIXME compute the stress components for MLHO
-md.stressbalance.requested_outputs = ['default','VxSurface','VySurface','VxShear','VyShear','VxBase','VyBase', 'MassFlux1', 'MassFlux2', 'MassFlux3', 'MassFlux4', 'MassFlux5', 'MassFlux6']
+md.stressbalance.requested_outputs = ['default', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase', 'MassFlux1', 'MassFlux2', 'MassFlux3', 'MassFlux4', 'MassFlux5', 'MassFlux6']
 #md.stressbalance.requested_outputs = ['default', 'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy', 'MassFlux1', 'MassFlux2', 'MassFlux3', 'MassFlux4', 'MassFlux5', 'MassFlux6']
 md.outputdefinition.definitions = [massfluxatgate('name', 'MassFlux1', 'profilename', '../Exp/MassFlux1.exp', 'definitionstring', 'Outputdefinition1'),
@@ -25 +26 @@
                                    massfluxatgate('name', 'MassFlux5', 'profilename', '../Exp/MassFlux5.exp', 'definitionstring', 'Outputdefinition5'),
                                    massfluxatgate('name', 'MassFlux6', 'profilename', '../Exp/MassFlux6.exp', 'definitionstring', 'Outputdefinition6')]
-md = SetMLHOBC(md);
+md = SetMLHOBC(md)
 md = solve(md, 'Stressbalance')
 
 #Fields and tolerances to track changes
-field_names = ['Vx', 'Vy', 'Vel', 'Pressure','VxSurface','VySurface','VxShear','VyShear','VxBase','VyBase',
+field_names = ['Vx', 'Vy', 'Vel', 'Pressure', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase',
                'MassFlux1', 'MassFlux2', 'MassFlux3', 'MassFlux4', 'MassFlux5', 'MassFlux6']
-               #'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy',
-field_tolerances = [3e-13, 1e-13, 1e-13, 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,
+#'DeviatoricStressxx', 'DeviatoricStressyy', 'DeviatoricStressxy',
+field_tolerances = [3e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
                     2e-13, 1e-13, 2e-13,
                     1e-13, 1e-13, 1e-13,
@@ -52 +53 @@
                 md.results.StressbalanceSolution.MassFlux5,
                 md.results.StressbalanceSolution.MassFlux6]
-                #md.results.StressbalanceSolution.DeviatoricStressxx,
-                #md.results.StressbalanceSolution.DeviatoricStressyy,
-                #md.results.StressbalanceSolution.DeviatoricStressxy,
+#md.results.StressbalanceSolution.DeviatoricStressxx,
+#md.results.StressbalanceSolution.DeviatoricStressyy,
+#md.results.StressbalanceSolution.DeviatoricStressxy,