Changeset 27443

Timestamp:

11/28/22 19:41:23 (2 years ago)

Author:

jdquinn

Message:

CHG: Catch permission error; cleanup

Location:

issm/trunk-jpl

Files:

• jenkins/jenkins.sh (modified) (1 diff)
• packagers/linux/package-issm-linux-binaries-python-2.sh (modified) (1 diff)
• packagers/linux/package-issm-linux-binaries-python-3.sh (modified) (1 diff)
• packagers/mac/package-issm-mac-binaries-python-2.sh (modified) (1 diff)
• packagers/mac/package-issm-mac-binaries-python-3.sh (modified) (1 diff)
• packagers/mac/test-issm-mac-binaries-python-2.sh (modified) (1 diff)
• packagers/mac/test-issm-mac-binaries-python-3.sh (modified) (1 diff)
• src/m/classes/hydrologyglads.m (modified) (1 diff)
• test/NightlyRun/runme.py (modified) (1 diff)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -497 +497 @@
 
         # Check that Python did not exit in error
-        pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter|syntax error" python_log.log`
+        pythonExitedInError=`grep -c -E "Error|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python_log.log`
 
         if [ $pythonExitedInError -ne 0 ]; then

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh

@@ -139 +139 @@
         # Check that Python did not exit in error
         pythonExitCode=`echo $?`
-        pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter|syntax error" python.log`
+        pythonExitedInError=`grep -c -E "Error|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log`
 
         if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh

@@ -142 +142 @@
         # Check that Python did not exit in error
         pythonExitCode=`echo $?`
-        pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter|syntax error" python.log`
+        pythonExitedInError=`grep -c -E "Error|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log`
 
         if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then

issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh

@@ -152 +152 @@
         # Check that Python did not exit in error
         pythonExitCode=`echo $?`
-        pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter|syntax error" python.log`
+        pythonExitedInError=`grep -c -E "Error|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log`
 
         if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then

issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh

@@ -155 +155 @@
         # Check that Python did not exit in error
         pythonExitCode=`echo $?`
-        pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter|syntax error" python.log`
+        pythonExitedInError=`grep -c -E "Error|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log`
 
         if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then

issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh

@@ -34 +34 @@
 # Check that Python did not exit in error
 pythonExitCode=`echo $?`
-pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter|syntax error" python.log`
+pythonExitedInError=`grep -c -E "Error|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log`
 
 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then

issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh

@@ -34 +34 @@
 # Check that Python did not exit in error
 pythonExitCode=`echo $?`
-pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter|syntax error" python.log`
+pythonExitedInError=`grep -c -E "Error|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log`
 
 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then

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

@@ -64 +64 @@
 
                         %Sheet
-                        md = checkfield(md,'fieldname','hydrology.pressure_melt_coefficient','numel',[1],'>=',0);       
-                        md = checkfield(md,'fieldname','hydrology.sheet_conductivity','size',[md.mesh.numberofvertices 1],'>',0,'NaN',1,'Inf',1);       
-                        md = checkfield(md,'fieldname','hydrology.cavity_spacing','numel',[1],'>',0);   
+                        md = checkfield(md,'fieldname','hydrology.pressure_melt_coefficient','numel',[1],'>=',0);
+                        md = checkfield(md,'fieldname','hydrology.sheet_conductivity','size',[md.mesh.numberofvertices 1],'>',0,'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','hydrology.cavity_spacing','numel',[1],'>',0);
                         md = checkfield(md,'fieldname','hydrology.bump_height','size',[md.mesh.numberofvertices 1],'>=',0,'NaN',1,'Inf',1);
 
                         %Channels
                         md = checkfield(md,'fieldname','hydrology.ischannels','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'fieldname','hydrology.channel_conductivity','size',[md.mesh.numberofvertices 1],'>=',0,'NaN',1,'Inf',1);    
-                        md = checkfield(md,'fieldname','hydrology.channel_sheet_width','numel',[1],'>=',0);     
+                        md = checkfield(md,'fieldname','hydrology.channel_conductivity','size',[md.mesh.numberofvertices 1],'>=',0,'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','hydrology.channel_sheet_width','numel',[1],'>=',0);
 
                         %Other

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

@@ -89 +89 @@
     exception'; see also jenkins/jenkins.sh). These should be counted as
     failures.
-    - Figure out why the following changes allow for correct partitioning of 
-    test set, but cause an error with ADOL-C build (some test logs are parsed 
-    twice).
     """