Changeset 25806

Timestamp:

12/02/20 13:54:38 (4 years ago)

Author:

jdquinn

Message:

CHG: Python implementation of frictionschoof

Location:

issm/trunk-jpl

Files:

• src/m/classes/calving.py (modified) (3 diffs)
• src/m/classes/frictionschoof.py (added)
• src/m/classes/frictionshakti.py (modified) (1 diff)
• src/m/classes/inversion.py (modified) (2 diffs)
• src/m/classes/solidearthsettings.py (modified) (3 diffs)
• src/m/inversions/supportedcontrols.py (modified) (1 diff)
• src/m/inversions/supportedcostfunctions.py (modified) (1 diff)
• src/m/qmu/postqmu.m (modified) (1 diff)
• test/NightlyRun/runme.m (modified) (1 diff)
• test/NightlyRun/test350.py (modified) (1 diff)
• test/NightlyRun/test356.py (added)
• test/NightlyRun/test444.py (modified) (1 diff)
• test/NightlyRun/test481.py (added)

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

@@ +1 @@
+import numpy as np
+
+from checkfield import checkfield
 from fielddisplay import fielddisplay
 from project3d import project3d
-from checkfield import checkfield
 from WriteData import WriteData
 
 
 class calving(object):
-    """
-    CALVING class definition
+    """CALVING class definition
 
-       Usage:
-          calving = calving()
+    Usage:
+        calving = calving()
     """
 
     def __init__(self):  # {{{
-
-        self.calvingrate = float('NaN')
-
-    #set defaults
+        self.calvingrate = np.nan
         self.setdefaultparameters()
 
@@ -23 +21 @@
 
     def __repr__(self):  # {{{
-        string = '   Calving parameters:'
-        string = "%s\n%s" % (string, fielddisplay(self, 'calvingrate', 'calving rate at given location [m / a]'))
-
-        return string
+        s = '   Calving parameters:'
+        s += '{}\n'.format(fielddisplay(self, 'calvingrate', 'calving rate at given location [m / a]'))
+        return s
     #}}}
 
@@ -40 +37 @@
     def checkconsistency(self, md, solution, analyses):  # {{{
         #Early return
-        if (solution != 'TransientSolution') or (not md.transient.ismovingfront):
+        if solution != 'TransientSolution' or not md.transient.ismovingfront:
             return md
 

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

@@ -28 +28 @@
         s = 'Basal shear stress parameters: Sigma_b = coefficient^2 * Neff * u_b\n'
         s += '(effective stress Neff = rho_ice * g * thickness + rho_water * g * (head - b))\n'
-        s += "{}\n".format(fielddisplay(self, "coefficient", "friction coefficient [SI]"))
+        s += '{}\n'.format(fielddisplay(self, 'coefficient', 'friction coefficient [SI]'))
         return s
     #}}}

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

@@ -54 +54 @@
         s += '{}\n'.format(fielddisplay(self, 'min_parameters', 'absolute minimum acceptable value of the inversed parameter on each vertex'))
         s += '{}\n'.format(fielddisplay(self, 'max_parameters', 'absolute maximum acceptable value of the inversed parameter on each vertex'))
-        s += '{}\n'.format(fielddisplay(self, 'vx_obs', 'observed velocity x component [m / yr]'))
-        s += '{}\n'.format(fielddisplay(self, 'vy_obs', 'observed velocity y component [m / yr]'))
-        s += '{}\n'.format(fielddisplay(self, 'vel_obs', 'observed velocity magnitude [m / yr]'))
+        s += '{}\n'.format(fielddisplay(self, 'vx_obs', 'observed velocity x component [m/yr]'))
+        s += '{}\n'.format(fielddisplay(self, 'vy_obs', 'observed velocity y component [m/yr]'))
+        s += '{}\n'.format(fielddisplay(self, 'vel_obs', 'observed velocity magnitude [m/yr]'))
         s += '{}\n'.format(fielddisplay(self, 'thickness_obs', 'observed thickness [m]'))
         s += '{}\n'.format(fielddisplay(self, 'surface_obs', 'observed surface elevation [m]'))
@@ -160 +160 @@
             return
         WriteData(fid, prefix, 'object', self, 'fieldname', 'nsteps', 'format', 'Integer')
-        WriteData(fid, prefix, 'object', self, 'fieldname', 'maxiter_per_step', 'format', 'DoubleMat', 'mattype', 3)
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'maxiter_per_step', 'format', 'IntMat', 'mattype', 3)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'cost_functions_coefficients', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'gradient_scaling', 'format', 'DoubleMat', 'mattype', 3)

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

@@ -22 +22 @@
         self.ocean_area_scaling     = 0
         self.runfrequency           = 1 # How many time steps we skip before we run grd_core
-        self.computesealevelchange  = 0 # Will grd_core compute sea level?
+        self.computesealevelchange  = 1 # Will grd_core compute sea level?
         self.isgrd                  = 1 # Will GRD patterns be computed?
         self.degacc                 = 0 # Degree increment for resolution of Green tables
@@ -66 +66 @@
         self.ocean_area_scaling = 0
         self.isgrd = 1
-        self.computesealevelchange = 0
+        self.computesealevelchange = 1
 
         # Numerical discretization accuracy
@@ -74 +74 @@
         self.runfrequency = 1
 
+        # Fractional contribution
+        self.glfraction = 1
+
         # Horizontal displacement? (not on by default)
         self.horiz = 0
-
-        # Fractional contribution
-        self.glfraction = 1
     #}}}
 

issm/trunk-jpl/src/m/inversions/supportedcontrols.py

@@ -1 +1 @@
 def supportedcontrols():
-    return ['BalancethicknessThickeningRate', 'FrictionCoefficient', 'FrictionAs', 'MaterialsRheologyBbar', 'DamageDbar', 'Vx', 'Vy']
+    return [
+        'BalancethicknessThickeningRate',
+        'FrictionCoefficient',
+        'FrictionC',
+        'FrictionAs',
+        'MaterialsRheologyBbar',
+        'DamageDbar',
+        'Vx',
+        'Vy',
+        'Thickness',
+        'BalancethicknessOmega',
+        'BalancethicknessApparentMassbalance',
+        'MaterialsRheologyB'
+    ]

issm/trunk-jpl/src/m/inversions/supportedcostfunctions.py

@@ -1 +1 @@
 def supportedcostfunctions():
-    return [101, 102, 103, 104, 105, 201, 501, 502, 503, 504, 505]
+    return list(range(101, 105 + 1)) + [201] + list(range(501, 508 + 1)) + [510] + list(range(601, 604 + 1))

issm/trunk-jpl/src/m/qmu/postqmu.m

@@ -16 +16 @@
            fline=fgetl(fide);
        end
-       warning(['Dakota returned error in ''' qmuerrfile ' file. qmu directory retained.'])
+       warning(['Dakota returned error in ''' qmuerrfile ''' file. QMU directory retained.'])
    end
    status=fclose(fide);

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

@@ -107 +107 @@
 %Process Ids according to benchmarks{{{
 if strcmpi(benchmark,'nightly'),
-        test_ids=intersect(test_ids,[1:999]);
+        test_ids=intersect(test_ids,union([1:999]));
 elseif strcmpi(benchmark,'validation'),
         test_ids=intersect(test_ids,[1001:1999]);

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

@@ -1 +1 @@
 #Test Name: SquareSheetHydrologyShakti
+import numpy as np
+
+from frictionshakti import frictionshakti
+from MatlabFuncs import oshostname
+from model import *
 from operator import itemgetter
-import numpy as np
-from model import *
-from socket import gethostname
-from triangle import triangle
-from setmask import setmask
 from parameterize import parameterize
 from setflowequation import setflowequation
+from setmask import setmask
 from solve import solve
-from frictionshakti import frictionshakti
 from transient import transient
+from triangle import triangle
 
 md = triangle(model(), '../Exp/Square.exp', 50000.)

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

@@ -7 +7 @@
 
 import numpy as np
+
+from ContourToMesh import *
+from dmeth_params_set import *
+from MatlabFuncs import oshostname
 from model import *
+from parameterize import *
+from partitioner import *
+from regionaloutput import *
+from setflowequation import *
+from setmask import *
+from solve import *
 from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
-from partitioner import *
-from dmeth_params_set import *
-from ContourToMesh import *
-from regionaloutput import *
 
 #model not consistent:  equality thickness = surface-base violated