Merge pull request #13 from vub-hpc/develop

Update to v1.6.1
vub-hpc · Aug 5, 2022 · 2d71ae4 · 2d71ae4
2 parents c16c2e1 + 8a30208
commit 2d71ae4
Show file tree

Hide file tree

Showing 13 changed files with 224 additions and 114 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+easyconfigs export-ignore
diff --git a/README.md b/README.md
diff --git a/irods/cime-5.6.19/01-CIME-fix-download-server-fallback.patch b/irods/cime-5.6.19/01-CIME-fix-download-server-fallback.patch
@@ -10,7 +10,7 @@ diff -W 126 -Nru cesm-2.1.2-orig/cime/scripts/lib/CIME/case/check_input_data.py
      expect(data_list_files, "No .input_data_list files found in dir '{}'".format(data_list_dir))
 
 -    no_files_missing = True
-+    chksum_required = ["svn", "gftp", "ftp", "wget"]
++    chksum_required = ["gftp", "ftp", "wget"]
 +
      if download:
          if protocol not in vars(CIME.Servers):

diff --git a/irods/cime-5.6.32/01-CIME-fix-download-server-fallback.patch b/irods/cime-5.6.32/01-CIME-fix-download-server-fallback.patch
@@ -10,7 +10,7 @@ diff -W 126 -Nru cesm-2.1.3-orig/cime/scripts/lib/CIME/case/check_input_data.py
      expect(data_list_files, "No .input_data_list files found in dir '{}'".format(data_list_dir))
 
 -    no_files_missing = True
-+    chksum_required = ["svn", "gftp", "ftp", "wget"]
++    chksum_required = ["gftp", "ftp", "wget"]
 +
      if download:
          if protocol not in vars(CIME.Servers):

diff --git a/irods/cime-5.8.32/01-CIME-fix-download-server-fallback.patch b/irods/cime-5.8.32/01-CIME-fix-download-server-fallback.patch
@@ -9,7 +9,7 @@ author: Alex Domingo (Vrije Universiteit Brussel)
          logger.warning("WARNING: No .input_data_list files found in dir '{}'".format(data_list_dir))
 
 -    no_files_missing = True
-+    chksum_required = ["svn", "gftp", "ftp", "wget"]
++    chksum_required = ["gftp", "ftp", "wget"]
 +
      if download:
          if protocol not in vars(CIME.Servers):

diff --git a/machines/config_compilers.xml b/machines/config_compilers.xml
@@ -48,15 +48,16 @@ Author: Alex Domingo (Vrije Universiteit Brussel)
   <compiler MACH="hydra" COMPILER="gnu">
     <MPICC> mpicc  </MPICC>
     <MPICXX> mpicxx </MPICXX>
-    <MPIFC> mpif90 </MPIFC>
+    <MPIFC> mpifort </MPIFC>
     <SCC> gcc </SCC>
     <SCXX> g++ </SCXX>
     <SFC> gfortran </SFC>
     <CFLAGS>
       <append DEBUG="FALSE"> -O2 </append>
     </CFLAGS>
     <FFLAGS>
-      <append DEBUG="FALSE"> -O2 -fallow-argument-mismatch -fallow-invalid-boz </append>
+      <append DEBUG="FALSE"> -O2 </append>
+      <append> -fallow-argument-mismatch -fallow-invalid-boz </append>
     </FFLAGS>
     <SLIBS>
       <append> -L$ENV{EBROOTSCALAPACK}/lib -lscalapack -L$ENV{EBROOTOPENBLAS}/lib -lopenblas </append>
@@ -92,15 +93,16 @@ Author: Alex Domingo (Vrije Universiteit Brussel)
   <compiler MACH="hortense" COMPILER="gnu">
     <MPICC> mpicc  </MPICC>
     <MPICXX> mpicxx </MPICXX>
-    <MPIFC> mpif90 </MPIFC>
+    <MPIFC> mpifort </MPIFC>
     <SCC> gcc </SCC>
     <SCXX> g++ </SCXX>
     <SFC> gfortran </SFC>
     <CFLAGS>
       <append DEBUG="FALSE"> -O2 </append>
     </CFLAGS>
     <FFLAGS>
-      <append DEBUG="FALSE"> -O2 -fallow-argument-mismatch -fallow-invalid-boz </append>
+      <append DEBUG="FALSE"> -O2 </append>
+      <append> -fallow-argument-mismatch -fallow-invalid-boz </append>
     </FFLAGS>
     <SLIBS>
       <append> -L$ENV{EBROOTSCALAPACK}/lib -lscalapack -L$ENV{EBROOTOPENBLAS}/lib -lopenblas </append>

diff --git a/validation/breniac/2.1.1/POP-ECT.out → ...reniac/POP-ECT.cesm_2.1.1.intel_2018a.out b/validation/breniac/2.1.1/POP-ECT.out → ...reniac/POP-ECT.cesm_2.1.1.intel_2018a.out
diff --git a/validation/hortense/POP-ECT.cesm_2.2.0.foss_2021b.out b/validation/hortense/POP-ECT.cesm_2.2.0.foss_2021b.out
@@ -0,0 +1,12 @@
+CESM Version Tested: CESM 2.2.0
+Metadata retrieved from: POP-ECT.cesm_2.2.0_2021b.000.pop.h.0001-12.nc
+
+**********Run 1 (file=/cesmwebverify/ensembles/20220804081313471395/POP-ECT.cesm_2.2.0_2021b.000.pop.h.0001-12.nc):
+                UVEL: 99.55%
+                VVEL: 99.55%
+                TEMP: 99.38%
+                SALT: 99.46%
+                 SSH: 99.76%
+**********0 of 5 variables failed, resulting in an overall PASS**********
+
+Testing complete.
diff --git a/validation/hortense/UF-CAM-ECT.cesm_2.2.0.foss_2021b.out b/validation/hortense/UF-CAM-ECT.cesm_2.2.0.foss_2021b.out
@@ -0,0 +1,20 @@
+CESM Version Tested: CESM 2.2.0
+Metadata retrieved from: UF-CAM-ECT.cesm_2.2.0_2021b.000.cam.h0.0001-01-01-00000.nc
+
+*********************************************** 
+PCA Test Results
+*********************************************** 
+
+Summary: 0 PC scores failed at least 2 runs:  []
+
+These runs PASSED according to our testing criterion.
+PC 27: failed 1 runs  [3]
+PC 28: failed 1 runs  [2]
+PC 39: failed 1 runs  [3]
+PC 48: failed 1 runs  [3]
+
+Run 1: 0 PC scores failed  []
+Run 2: 1 PC scores failed  [28]
+Run 3: 3 PC scores failed  [27, 39, 48]
+
+Testing complete.
diff --git a/validation/hydra/2.1.1/POP-ECT.out → ...n/hydra/POP-ECT.cesm_2.1.1.foss_2019a.out b/validation/hydra/2.1.1/POP-ECT.out → ...n/hydra/POP-ECT.cesm_2.1.1.foss_2019a.out
diff --git a/validation/hydra/POP-ECT.cesm_2.2.0.foss_2021b.out b/validation/hydra/POP-ECT.cesm_2.2.0.foss_2021b.out
@@ -0,0 +1,12 @@
+CESM Version Tested: CESM 2.2.0
+Metadata retrieved from: POP-ECT.cesm_2.2.0_2021b.000.pop.h.0001-12.nc
+
+**********Run 1 (file=/cesmwebverify/ensembles/2022080402591173792/POP-ECT.cesm_2.2.0_2021b.000.pop.h.0001-12.nc):
+                UVEL: 99.37%
+                VVEL: 99.22%
+                TEMP: 99.32%
+                SALT: 99.38%
+                 SSH: 98.83%
+**********0 of 5 variables failed, resulting in an overall PASS**********
+
+Testing complete.
diff --git a/validation/hydra/2.1.1/UF-CAM-ECT.out → ...ydra/UF-CAM-ECT.cesm_2.1.1.foss_2019a.out b/validation/hydra/2.1.1/UF-CAM-ECT.out → ...ydra/UF-CAM-ECT.cesm_2.1.1.foss_2019a.out
diff --git a/validation/hydra/UF-CAM-ECT.cesm_2.2.0.foss_2021b.out b/validation/hydra/UF-CAM-ECT.cesm_2.2.0.foss_2021b.out
@@ -0,0 +1,21 @@
+ESM Version Tested: CESM 2.2.0
+Metadata retrieved from: UF-CAM-ECT.cesm_2.2.0_2021b.000.cam.h0.0001-01-01-00000.nc
+
+*********************************************** 
+PCA Test Results
+*********************************************** 
+
+Summary: 0 PC scores failed at least 2 runs:  []
+
+These runs PASSED according to our testing criterion.
+PC 9: failed 1 runs  [3]
+PC 24: failed 1 runs  [3]
+PC 26: failed 1 runs  [1]
+PC 37: failed 1 runs  [1]
+PC 41: failed 1 runs  [1]
+
+Run 1: 3 PC scores failed  [26, 37, 41]
+Run 2: 0 PC scores failed  []
+Run 3: 2 PC scores failed  [9, 24]
+
+Testing complete.