Changeset 25818

Timestamp:

12/03/20 05:50:05 (4 years ago)

Author:

bdef

Message:

NEW: Adding SIGMA Saga cluster

Location:

issm/trunk-jpl/src/m/classes

Files:

• clusters/saga.py (added)
• model.py (modified) (3 diffs)

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

@@ -42 +42 @@
 from cyclone import cyclone
 from stallo import stallo
+from saga import saga
 from balancethickness import balancethickness
 from stressbalance import stressbalance
@@ -867 +868 @@
         md.stressbalance.referential = project2d(md, md.stressbalance.referential, md.mesh.numberoflayers)
         md.stressbalance.loadingforce = project2d(md, md.stressbalance.loadingforce, md.mesh.numberoflayers)
-        # TODO: 
+        # TODO:
         # - Check if md.mesh.numberoflayershould really be offset by 1.
-        # - Find out why md.masstransport.spcthickness is not offset, but the 
+        # - Find out why md.masstransport.spcthickness is not offset, but the
         #   other fields are.
-        # - If offset is required, figure out if it can be abstarcted away to 
+        # - If offset is required, figure out if it can be abstarcted away to
         #   another part of the API.
         if np.size(md.masstransport.spcthickness) > 1:
             md.masstransport.spcthickness = project2d(md, md.masstransport.spcthickness, md.mesh.numberoflayers)
-        if np.size(md.damage.spcdamage) > 1 and not np.isnan(md.damage.spcdamage).all():
+        if np.size(md.damage.spcdamage) > 1:  # and not np.isnan(md.damage.spcdamage).all():
             md.damage.spcdamage = project2d(md, md.damage.spcdamage, md.mesh.numberoflayers - 1)
         if np.size(md.levelset.spclevelset) > 1:
@@ -883 +884 @@
         # Hydrologydc variables
         if md.hydrology.__class__.__name__ == 'hydrologydc':
-            md.hydrology.spcsediment_head = project2d(md, md.hydrology.spcsediment_head, 1)
-            md.hydrology.mask_eplactive_node = project2d(md, md.hydrology.mask_eplactive_node, 1)
-            md.hydrology.sediment_transmitivity = project2d(md, md.hydrology.sediment_transmitivity, 1)
-            md.hydrology.basal_moulin_input = project2d(md, md.hydrology.basal_moulin_input, 1)
-            if md.hydrology.isefficientlayer == 1:
-                md.hydrology.spcepl_head = project2d(md, md.hydrology.spcepl_head, 1)
-            # hydrofields = md.hydrology.__dict__.keys()
-            # for field in hydrofields:
-            #     try:
-            #         isvector = np.logical_or(np.shape(md.hydrology.__dict__[field])[0] == md.mesh.numberofelements,
-            #                                  np.shape(md.hydrology.__dict__[field])[0] == md.mesh.numberofvertices)
-            #     except IndexError:
-            #         isvector = False
-            #     #we collapse only fields that are vertices or element based
-            #     if isvector:
-            #         md.hydrology.__dict__[field] = project2d(md, md.hydrology.__dict__[field], 1)
+            # md.hydrology.spcsediment_head = project2d(md, md.hydrology.spcsediment_head, 1)
+            # md.hydrology.mask_eplactive_node = project2d(md, md.hydrology.mask_eplactive_node, 1)
+            # md.hydrology.sediment_transmitivity = project2d(md, md.hydrology.sediment_transmitivity, 1)
+            # md.hydrology.basal_moulin_input = project2d(md, md.hydrology.basal_moulin_input, 1)
+            # if md.hydrology.isefficientlayer == 1:
+            #     md.hydrology.spcepl_head = project2d(md, md.hydrology.spcepl_head, 1)
+            hydrofields = md.hydrology.__dict__.keys()
+            for field in hydrofields:
+                try:
+                    isvector = np.logical_or(np.shape(md.hydrology.__dict__[field])[0] == md.mesh.numberofelements,
+                                             np.shape(md.hydrology.__dict__[field])[0] == md.mesh.numberofvertices)
+                except IndexError:
+                    isvector = False
+                #we collapse only fields that are vertices or element based
+                if isvector:
+                    md.hydrology.__dict__[field] = project2d(md, md.hydrology.__dict__[field], 1)
 
         # Materials