Get JRA55_IAF libaccessom2 test working on Gadi. Had MCT remapping pr…

…oblem due to old forcing.json file. #36
COSIMA · Jun 19, 2020 · b725f0b · b725f0b
1 parent 4198e15
commit b725f0b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -70,13 +70,13 @@ qsub -I -P x77 -q normal -lncpus=4 -lmem=16Gb -lwalltime=3:00:00 -lstorage=gdata
 
 
 ```{bash}
-export LIBACCESSOM2_DIR=$(pwd)
+export LIBACCESSOM2_ROOT=$(pwd)
 module load openmpi
 cd tests/
 ./copy_test_data.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
+rm -rf log ; mkdir log ; rm -f accessom2_restart.nml ; cp ../test_data/i2o.nc ./ ; cp ../test_data/o2i.nc ./
+export UCX_LOG_LEVEL=error; mpirun -np 1 $LIBACCESSOM2_ROOT/build/bin/yatm.exe : -np 1 $LIBACCESSOM2_ROOT/build/bin/ice_stub.exe : -np 1 $LIBACCESSOM2_ROOT/build/bin/ocean_stub.exe
 ```
 
 Or, if Python3 and pytest is installed:

diff --git a/tests/JRA55_IAF/forcing.json b/tests/JRA55_IAF/forcing.json
@@ -29,7 +29,8 @@
     {
       "filename": "/g/data/ua8/JRA55-do/latest/runoff_all.{{year}}.nc",
       "fieldname": "friver",
-      "cname": "runof_ai"
+      "cname": "runof_ai",
+      "domain": "land"
     },
     {
       "filename": "/g/data/ua8/JRA55-do/latest/t_10.{{year}}.nc",

diff --git a/tests/JRA55_IAF/namcouple b/tests/JRA55_IAF/namcouple
@@ -57,7 +57,7 @@ P  0  P  0
 #
 LOCTRANS MAPPING SCRIPR
 INSTANT
-../test_data/rmp_jra55_cice_conserve.nc dst
+../test_data/rmp_jra55_cice_1st_conserve.nc dst
 CONSERV LR SCALAR LATLON 10 FRACNNEI FIRST
 #########
 # Field 02 : lwflx down
@@ -68,7 +68,7 @@ P  0  P  0
 #
 LOCTRANS MAPPING SCRIPR
 INSTANT
-../test_data/rmp_jra55_cice_conserve.nc dst
+../test_data/rmp_jra55_cice_1st_conserve.nc dst
 CONSERV LR SCALAR LATLON 10 FRACNNEI FIRST
 ##########
 # Field 03 : rainfall
@@ -79,7 +79,7 @@ P  0  P  0
 #
 LOCTRANS MAPPING SCRIPR
 INSTANT
-../test_data/rmp_jra55_cice_conserve.nc dst
+../test_data/rmp_jra55_cice_1st_conserve.nc dst
 CONSERV LR SCALAR LATLON 10 FRACNNEI FIRST
 ##########
 # Field 04 : snowfall
@@ -90,7 +90,7 @@ P  0  P  0
 #
 LOCTRANS MAPPING SCRIPR
 INSTANT
-../test_data/rmp_jra55_cice_conserve.nc dst
+../test_data/rmp_jra55_cice_1st_conserve.nc dst
 CONSERV LR SCALAR LATLON 10 FRACNNEI FIRST
 ##########
 # Field 05 : surface pressure
@@ -101,7 +101,7 @@ P  0  P  0
 #
 LOCTRANS MAPPING SCRIPR
 INSTANT
-../test_data/rmp_jra55_cice_smooth.nc dst
+../test_data/rmp_jra55_cice_patch.nc dst
 CONSERV LR SCALAR LATLON 10 FRACNNEI FIRST
 ##########
 # Field 06 : runoff. Runoff is passed on the destination grid.
@@ -121,7 +121,7 @@ P  0  P  0
 #
 LOCTRANS MAPPING SCRIPR
 INSTANT
-../test_data/rmp_jra55_cice_smooth.nc dst
+../test_data/rmp_jra55_cice_patch.nc dst
 CONSERV LR SCALAR LATLON 10 FRACNNEI FIRST
 ##########
 # Field 08 : 2m air humidity
@@ -132,7 +132,7 @@ P  0  P  0
 #
 LOCTRANS MAPPING SCRIPR
 INSTANT
-../test_data/rmp_jra55_cice_smooth.nc dst
+../test_data/rmp_jra55_cice_patch.nc dst
 CONSERV LR SCALAR LATLON 10 FRACNNEI FIRST
 ##########
 # Field 09 : 10m wind (u)
@@ -142,7 +142,7 @@ jrat cict LAG=0 SEQ=+1
 P  0  P  0
 #
 MAPPING SCRIPR
-../test_data/rmp_jra55_cice_smooth.nc dst
+../test_data/rmp_jra55_cice_patch.nc dst
 DISTWGT LR VECTOR LATLON 10 4 vwnd_ai
 ##########
 # Field 10 : 10m wind (v)
@@ -152,7 +152,7 @@ jrat cict LAG=0 SEQ=+1
 P  0  P  0
 #
 MAPPING SCRIPR
-../test_data/rmp_jra55_cice_smooth.nc dst
+../test_data/rmp_jra55_cice_patch.nc dst
 DISTWGT LR VECTOR LATLON 10 4 uwnd_ai
 ############################################################################
 #

diff --git a/tests/copy_test_data.sh b/tests/copy_test_data.sh
@@ -3,10 +3,10 @@
 mkdir -p test_data
 
 # Copy over OASIS remap weights
-cp /g/data/ik11/inputs/access-om2/input_rc/common_1deg_jra55/* test_data/
+cp /g/data/ik11/inputs/access-om2/input_20200530/common_1deg_jra55/* test_data/
 
 # Copy over river runoff remap weights
-cp /g/data/ik11/inputs/access-om2/input_rc/yatm_1deg/rmp_jrar_to_cict_CONSERV.nc test_data/
+cp /g/data/ik11/inputs/access-om2/input_20200530/yatm_1deg/rmp_jrar_to_cict_CONSERV.nc test_data/
 
 # Copy ice grid and OASIS restarts
-cp /g/data/ik11/inputs/access-om2/input_rc/cice_1deg/* test_data/
+cp /g/data/ik11/inputs/access-om2/input_20200530/cice_1deg/* test_data/