Changeset 27451

Timestamp:

12/03/22 20:02:23 (2 years ago)

Author:

jdquinn

Message:

CHG: Checkfield bug in Python API; cleanup

Location:

issm/trunk-jpl/src/m/classes

Files:

• stressbalance.m (modified) (1 diff)
• stressbalance.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/stressbalance.m

@@ -115 +115 @@
                                 disp(sprintf('\n !!! Warning: no spc applied, model might not be well posed if no basal friction is applied, check for solution crash\n'));
                         end
-                        %CHECK THAT EACH LINES CONTAINS ONLY NAN VALUES OR NO NAN VALUES
+                        %CHECK THAT EACH LINE CONTAINS ONLY NAN VALUES OR NO NAN VALUES
                         if any(sum(isnan(md.stressbalance.referential),2)~=0 & sum(isnan(md.stressbalance.referential),2)~=6),
                                 md = checkmessage(md,['Each line of stressbalance.referential should contain either only NaN values or no NaN values']);

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

@@ -154 +154 @@
             md = checkfield(md, 'fieldname', 'stressbalance.vertex_pairing', '>', 0)
         # Singular solution
-        #        if ~any((~isnan(md.stressbalance.spcvx) + ~isnan(md.stressbalance.spcvy)) == 2),
         if (not np.any(np.logical_or(np.logical_not(np.isnan(md.stressbalance.spcvx)), np.logical_not(np.isnan(md.stressbalance.spcvy))))) & (not np.any(md.mask.ocean_levelset>0)):
-            print("\n !!! Warning: no spc applied, model might not be well posed if no basal friction is applied, check for solution crash\n")
-        # CHECK THAT EACH LINES CONTAINS ONLY NAN VALUES OR NO NAN VALUES
-        #        if any(sum(isnan(md.stressbalance.referential), 2)~=0 & sum(isnan(md.stressbalance.referential), 2)~=6),
+            print('\n !!! Warning: no spc applied, model might not be well posed if no basal friction is applied, check for solution crash\n')
+        # CHECK THAT EACH LINES CONTAIN ONLY NAN VALUES OR NO NAN VALUES
         if np.any(np.logical_and(np.sum(np.isnan(md.stressbalance.referential), axis=1) != 0, np.sum(np.isnan(md.stressbalance.referential), axis=1) != 6)):
-            md.checkmessage("Each line of stressbalance.referential should contain either only NaN values or no NaN values")
+            md.checkmessage('Each line of stressbalance.referential should contain either only NaN values or no NaN values')
         # CHECK THAT THE TWO VECTORS PROVIDED ARE ORTHOGONAL
-        #        if any(sum(isnan(md.stressbalance.referential), 2) == 0),
         if np.any(np.sum(np.isnan(md.stressbalance.referential), axis=1) == 0):
             pos = [i for i, item in enumerate(np.sum(np.isnan(md.stressbalance.referential), axis=1)) if item == 0]
-        #            np.inner (and np.dot) calculate all the dot product permutations, resulting in a full matrix multiply
-        #            if np.any(np.abs(np.inner(md.stressbalance.referential[pos, 0:2], md.stressbalance.referential[pos, 3:5]).diagonal()) > sys.float_info.epsilon):
-        #                md.checkmessage("Vectors in stressbalance.referential (columns 1 to 3 and 4 to 6) must be orthogonal")
             for item in md.stressbalance.referential[pos, :]:
                 if np.abs(np.inner(item[0:2], item[3:5])) > sys.float_info.epsilon:
-                    md.checkmessage("Vectors in stressbalance.referential (columns 1 to 3 and 4 to 6) must be orthogonal")
+                    md.checkmessage('Vectors in stressbalance.referential (columns 1 to 3 and 4 to 6) must be orthogonal')
         # CHECK THAT NO rotation specified for FS Grounded ice at base
         if m.strcmp(md.mesh.domaintype(), '3D') and md.flowequation.isFS:
             pos = np.nonzero(np.logical_and(md.mask.ocean_levelset, md.mesh.vertexonbase))
             if np.any(np.logical_not(np.isnan(md.stressbalance.referential[pos, :]))):
-                md.checkmessage("no referential should be specified for basal vertices of grounded ice")
+                md.checkmessage('no referential should be specified for basal vertices of grounded ice')
         if md.flowequation.isMOLHO:
             md = checkfield(md, 'fieldname', 'stressbalance.spcvx_base', 'Inf', 1, 'timeseries', 1)