Merge pull request #5 from COSIMA/feat-155-JRA55-v1p4-compat

Modify JRA55 v1.3 config to be compatible with JRA55 v1.4 exes
COSIMA · Apr 16, 2020 · 2eb6a35 · 2eb6a35
2 parents b30dae4 + 4662775
commit 2eb6a35
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/atmosphere/forcing.json b/atmosphere/forcing.json
@@ -29,7 +29,8 @@
     {
       "filename": "INPUT/RYF.runoff_all.1990_1991.nc",
       "fieldname": "friver",
-      "cname": "runof_ai"
+      "cname": "runof_ai",
+      "domain": "land"
     },
     {
       "filename": "INPUT/RYF.t_10.1990_1991.nc",

diff --git a/config.yaml b/config.yaml
@@ -17,21 +17,21 @@ input: /g/data4/ik11/inputs/access-om2/input_236a3011/common_025deg_jra55
 submodels:
     - name: atmosphere
       model: yatm
-      exe: /g/data4/ik11/inputs/access-om2/bin/yatm_c30e907f.exe
+      exe: /g/data4/ik11/inputs/access-om2/bin/yatm_4198e150.exe
       input: 
             - /g/data4/ik11/inputs/access-om2/input_236a3011/yatm_025deg
             - /g/data1a/ua8/JRA55-do/RYF/v1-3/
       ncpus: 1
 
     - name: ocean
       model: mom
-      exe: /g/data4/ik11/inputs/access-om2/bin/fms_ACCESS-OM_75e267c0_libaccessom2_c30e907f.x
+      exe: /g/data4/ik11/inputs/access-om2/bin/fms_ACCESS-OM_e837d05d_libaccessom2_4198e150.x
       input: /g/data4/ik11/inputs/access-om2/input_236a3011/mom_025deg
       ncpus: 1455
 
     - name: ice
       model: cice5
-      exe: /g/data4/ik11/inputs/access-om2/bin/cice_auscom_1440x1080_480p_e151c8bc_libaccessom2_c30e907f.exe
+      exe: /g/data4/ik11/inputs/access-om2/bin/cice_auscom_1440x1080_480p_597e4561_libaccessom2_4198e150.exe
       input: /g/data4/ik11/inputs/access-om2/input_236a3011/cice_025deg
       ncpus: 361
 

diff --git a/ice/input_ice.nml b/ice/input_ice.nml
@@ -17,4 +17,7 @@
     chk_o2i_fields = .false.
     chk_i2a_fields = .false.
     chk_a2i_fields = .false.
+    fields_from_atm = 'swfld_i', 'lwfld_i', 'rain_i', 'snow_i', 'press_i', 'runof_i', 'tair_i', 'qair_i', 'uwnd_i', 'vwnd_i'
+    fields_to_ocn = 'strsu_io', 'strsv_io', 'rain_io', 'snow_io', 'stflx_io', 'htflx_io', 'swflx_io', 'qflux_io', 'shflx_io', 'lwflx_io', 'runof_io', 'press_io', 'aice_io', 'melt_io', 'form_io'
+    fields_from_ocn = 'sst_i', 'sss_i', 'ssu_i', 'ssv_i', 'sslx_i', 'ssly_i', 'pfmice_i'
 /