Merge pull request #39 from COSIMA/gadi-transition

Gadi transition
COSIMA · Feb 17, 2020 · c30e907 · c30e907
2 parents 9fda758 + a9e2883
commit c30e907
Show file tree

Hide file tree

Showing 15 changed files with 53,501 additions and 53,505 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,9 +49,9 @@ endif()
 
 # compiler flags for ifort
 if(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -fpe0 -fp-model precise -traceback")
-  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -check all")
-  set(CMAKE_Fortran_FLAGS_RELEASE "-O3")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -fpe0 -fp-model precise -fp-model source -align all -traceback")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-g3 -O0 -check all")
+  set(CMAKE_Fortran_FLAGS_RELEASE "-g3 -O2 -axCORE-AVX2 -debug all -check none -qopt-report=5 -qopt-report-annotate")
 endif()
 
 # get external projects
@@ -87,7 +87,7 @@ set_property(TARGET jsonfortran PROPERTY IMPORTED_LOCATION ${BINARY_DIR}/lib/lib
 # json-fortran external project
 ExternalProject_Add(oasis3-mct
     GIT_REPOSITORY    https://github.com/COSIMA/oasis3-mct.git
-    GIT_TAG           43e3686890accbf496aa1f450907d00bc14e2ed4
+    GIT_TAG           87a873aa7b545a6ee46a42f811f5c7a5dfc81a01
     CONFIGURE_COMMAND ""
     BUILD_IN_SOURCE 1
     BUILD_COMMAND make ${PLATFORM}

diff --git a/README.md b/README.md
@@ -50,26 +50,23 @@ This repository also includes ice and ocean stubs. These are stand-ins for the t
 
 # Build
 
-How to build libaccessom2, YATM, ice\_stub and ocean\_stub:
+How to build libaccessom2, YATM, ice\_stub and ocean\_stub on gadi (NCI):
 
 ```{bash}
 git clone https://github.com/COSIMA/libaccessom2.git
 cd libaccessom2
-mkdir build
-cd build
-cmake ../
-cd ../
+./build_on_gadi.sh
 ```
 
-# Run tests on Raijin (NCI)
+# Run tests on Gadi (NCI)
 
 First do build as above. Then:
 
 ```{bash}
 export LIBACCESSOM2_DIR=$(pwd)
 module load openmpi
 cd tests/
-./copy_test_data_from_raijin.sh
+./copy_test_data_from_gadi.sh
 cd JRA55_IAF
 rm -rf log ; mkdir log ; rm -f accessom2_restart_datetime.nml ; cp ../test_data/i2o.nc ./ ; cp ../test_data/o2i.nc ./
 mpirun -np 1 $LIBACCESSOM2_DIR/build/bin/yatm.exe : -np 1 $LIBACCESSOM2_DIR/build/bin/ice_stub.exe : -np 1 $LIBACCESSOM2_DIR/build/bin/ocean_stub.exe

diff --git a/build_on_raijin.sh → build_on_gadi.sh b/build_on_raijin.sh → build_on_gadi.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
 module purge
-module load cmake/3.6.2
-module load netcdf/4.3.2
-module load intel-fc/17.0.1.132
-module load openmpi/1.10.2
+module load intel-compiler/2019.5.281
+module load netcdf/4.7.1
+module load openmpi/4.0.2
 
 MYDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

diff --git a/tests/FORCING_SCALING/checksums.txt b/tests/FORCING_SCALING/checksums.txt
diff --git a/tests/FORCING_SCALING/forcing.json b/tests/FORCING_SCALING/forcing.json
@@ -2,53 +2,53 @@
   "description": "JRA55-do V1.3 RYF 1990-91 forcing",
   "inputs": [
     {
-      "filename": "/g/data1/ua8/JRA55-do/RYF/v1-3/RYF.rsds.1990_1991.nc",
+      "filename": "/g/data/ua8/JRA55-do/RYF/v1-3/RYF.rsds.1990_1991.nc",
       "scaling_filename": "../test_data/scaling.RYF.rsds.1990_1991.nc",
       "fieldname": "rsds",
       "cname": "swfld_ai"
     },
     {
-      "filename": "/g/data1/ua8/JRA55-do/RYF/v1-3/RYF.rlds.1990_1991.nc",
+      "filename": "/g/data/ua8/JRA55-do/RYF/v1-3/RYF.rlds.1990_1991.nc",
       "fieldname": "rlds",
       "cname": "lwfld_ai"
     },
     {
-      "filename": "/g/data1/ua8/JRA55-do/RYF/v1-3/RYF.rain.1990_1991.nc",
+      "filename": "/g/data/ua8/JRA55-do/RYF/v1-3/RYF.rain.1990_1991.nc",
       "fieldname": "prrn",
       "cname": "rain_ai"
     },
     {
-      "filename": "/g/data1/ua8/JRA55-do/RYF/v1-3/RYF.snow.1990_1991.nc",
+      "filename": "/g/data/ua8/JRA55-do/RYF/v1-3/RYF.snow.1990_1991.nc",
       "fieldname": "prsn",
       "cname": "snow_ai"
     },
     {
-      "filename": "/g/data1/ua8/JRA55-do/RYF/v1-3/RYF.slp.1990_1991.nc",
+      "filename": "/g/data/ua8/JRA55-do/RYF/v1-3/RYF.slp.1990_1991.nc",
       "fieldname": "psl",
       "cname": "press_ai"
     },
     {
-      "filename": "/g/data1/ua8/JRA55-do/RYF/v1-3/RYF.runoff_all.1990_1991.nc",
+      "filename": "/g/data/ua8/JRA55-do/RYF/v1-3/RYF.runoff_all.1990_1991.nc",
       "fieldname": "friver",
       "cname": "runof_ai"
     },
     {
-      "filename": "/g/data1/ua8/JRA55-do/RYF/v1-3/RYF.t_10.1990_1991.nc",
+      "filename": "/g/data/ua8/JRA55-do/RYF/v1-3/RYF.t_10.1990_1991.nc",
       "fieldname": "tas_10m",
       "cname": "tair_ai"
     },
     {
-      "filename": "/g/data1/ua8/JRA55-do/RYF/v1-3/RYF.q_10.1990_1991.nc",
+      "filename": "/g/data/ua8/JRA55-do/RYF/v1-3/RYF.q_10.1990_1991.nc",
       "fieldname": "huss_10m",
       "cname": "qair_ai"
     },
     {
-      "filename": "/g/data1/ua8/JRA55-do/RYF/v1-3/RYF.u_10.1990_1991.nc",
+      "filename": "/g/data/ua8/JRA55-do/RYF/v1-3/RYF.u_10.1990_1991.nc",
       "fieldname": "uas_10m",
       "cname": "uwnd_ai"
     },
     {
-      "filename": "/g/data1/ua8/JRA55-do/RYF/v1-3/RYF.v_10.1990_1991.nc",
+      "filename": "/g/data/ua8/JRA55-do/RYF/v1-3/RYF.v_10.1990_1991.nc",
       "fieldname": "vas_10m",
       "cname": "vwnd_ai"
     }