Changeset 27495

Timestamp:

01/03/23 11:19:31 (2 years ago)

Author:

jdquinn

Message:

CHG: Checking out HEAD of MITgcm repo again; adjusted tolerances; add with-ocean option to configuration for full builds

Location:

issm/trunk-jpl

Files:

• jenkins/pine_island-mac-full (modified) (1 diff)
• jenkins/pine_island-mac-full-valgrind (modified) (1 diff)
• jenkins/ross-debian_linux-full (modified) (1 diff)
• jenkins/ross-debian_linux-full-valgrind (modified) (1 diff)
• test/MITgcm/install.sh (modified) (2 diffs)
• test/NightlyRun/test4001.m (modified) (1 diff)
• test/NightlyRun/test4002.m (modified) (1 diff)

issm/trunk-jpl/jenkins/pine_island-mac-full

@@ -13 +13 @@
         --enable-development \
         --enable-debugging \
+        --with-ocean \
         --with-numthreads=4 \
         --with-matlab-dir=${MATLAB_PATH} \

issm/trunk-jpl/jenkins/pine_island-mac-full-valgrind

@@ -13 +13 @@
         --enable-development \
         --enable-debugging \
+        --with-ocean \
         --with-numthreads=4 \
         --with-matlab-dir=${MATLAB_PATH} \

issm/trunk-jpl/jenkins/ross-debian_linux-full

@@ -13 +13 @@
         --enable-development \
         --enable-debugging \
+        --with-ocean \
         --with-numthreads=4 \
         --with-matlab-dir=${MATLAB_PATH} \

issm/trunk-jpl/jenkins/ross-debian_linux-full-valgrind

@@ -13 +13 @@
         --enable-development \
         --enable-debugging \
+        --with-ocean \
         --with-numthreads=4 \
         --with-matlab-dir=${MATLAB_PATH} \

issm/trunk-jpl/test/MITgcm/install.sh

@@ -3 +3 @@
 
 # Cleanup
-rm -rf install
+rm -rf build/* checkpoint* install
 
 ################################################################################
 
-# # Download source
-# git clone --depth=1 https://github.com/MITgcm/MITgcm.git
+# Download source
+git clone --depth=1 https://github.com/MITgcm/MITgcm.git
 
-# # Move source to 'install' directory
-# mv MITgcm install
+# Move source to 'install' directory
+mv MITgcm install
 
 ################################################################################
@@ -18 +18 @@
 #
 
-# Constants
-#
-VER="68h"
+# # Constants
+# #
+# VER="68h"
 
-# Download source
-wget https://github.com/MITgcm/MITgcm/archive/refs/tags/checkpoint${VER}.tar.gz
+# # Download source
+# wget https://github.com/MITgcm/MITgcm/archive/refs/tags/checkpoint${VER}.tar.gz
 
-# Uncompress source
-tar -xvzf checkpoint${VER}.tar.gz
+# # Uncompress source
+# tar -xvzf checkpoint${VER}.tar.gz
 
-# Move source to 'install' directory
-mv MITgcm-checkpoint${VER} install
+# # Move source to 'install' directory
+# mv MITgcm-checkpoint${VER} install

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

@@ -865 +865 @@
     'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',...
     'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'};
-field_tolerances={2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
-    1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,...
-    1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13 };
+field_tolerances={2e-13,1e-13,...
+    8e-06,7e-06,2e-07,1e-08,3e-08,1e-13,1e-13,...
+    8e-06,7e-06,4e-07,2e-08,5e-08,1e-13,6e-08,...
+    8e-06,7e-06,5e-07,4e-08,8e-08,6e-08,3e-07};
 field_values={...
     (md.results(1).TransientSolution(end).Base),...

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

@@ -1032 +1032 @@
     'Melting2','Vx3','Vy3','Thickness3','Base3','MaskOceanLevelset3','FloatingiceMeltingRate3',...
     'Melting3','Vx4','Vy4','Thickness4','Base4','MaskOceanLevelset4','FloatingiceMeltingRate4','Melting4'};
-field_tolerances={2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
-    1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,...
-    1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13 };
+field_tolerances={2e-11,1e-13,...
+    9e-06,7e-06,7e-10,4e-11,1e-13,1e-13,1e-13,...
+    9e-06,7e-06,1e-09,7e-11,1e-13,1e-13,1e-13,...
+    9e-06,7e-06,2e-09,9e-11,1e-13,1e-13,1e-13};
 field_values={...
     (md.results.TransientSolution(1).Base),...