From 466cd8050c2b050ffc38ae429f66b0d2d9c98a43 Mon Sep 17 00:00:00 2001
From: anton-climate <anton.steketee@anu.edu.au>
Date: Tue, 14 May 2024 16:18:42 +1000
Subject: [PATCH] Updated CICE grid per
 https://github.com/COSIMA/esmgrids/pull/6 This allows much stricter checking
 of angles in the ESMF files compared to the model grid files (per
 https://github.com/COSIMA/access-om3/issues/144)

---
 MOM_input            |  6 ++++++
 config.yaml          |  4 ++--
 manifests/input.yaml | 12 ++++++------
 nuopc.runconfig      |  1 +
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/MOM_input b/MOM_input
index ad5061b..fd30e98 100644
--- a/MOM_input
+++ b/MOM_input
@@ -408,6 +408,12 @@ RESTART_CONTROL = 3
                                 ! restart file is saved at the end of the run segment
                                 ! for any non-negative value."
 
+EPS_OMESH = 1e-13
+                                ! "default = 0.0001
+                                ! An float which sets the allowable error (in degrees) between
+                                ! grid angle defined in the ESMF mesh file used by CMEPS
+                                ! and the ocean_hgrid file used by mom
+
 ! === module MOM_tracer_flow_control ===
 USE_IDEAL_AGE_TRACER = True
                                 ! "[Boolean] default = False
diff --git a/config.yaml b/config.yaml
index 522b7f9..50c0a78 100644
--- a/config.yaml
+++ b/config.yaml
@@ -27,8 +27,8 @@ input:
     - /g/data/vk83/experiments/inputs/access-om3/mom/grids/vertical/global.1deg/2023.07.28/ocean_vgrid.nc
     - /g/data/vk83/experiments/inputs/access-om3/mom/initial_conditions/global.1deg/2020.10.22/ocean_temp_salt.res.nc
     - /g/data/vk83/experiments/inputs/access-om3/mom/surface_salt_restoring/global.1deg/2020.05.30/salt_sfc_restore.nc
-    - /g/data/vk83/experiments/inputs/access-om3/cice/grids/global.1deg/2020.05.30/grid.nc
-    - /g/data/vk83/experiments/inputs/access-om3/cice/grids/global.1deg/2020.10.22/kmt.nc
+    - /g/data/vk83/experiments/inputs/access-om3/cice/grids/global.1deg/2024.05.14/grid.nc
+    - /g/data/vk83/experiments/inputs/access-om3/cice/grids/global.1deg/2024.05.14/kmt.nc
     - /g/data/vk83/experiments/inputs/access-om3/cice/initial_conditions/global.1deg/2023.07.28/iced.1900-01-01-10800.nc
     - /g/data/qv56/replicas/input4MIPs/CMIP6/OMIP/MRI/MRI-JRA55-do-1-4-0/atmos/3hr/prsn/gr/v20190429
     - /g/data/qv56/replicas/input4MIPs/CMIP6/OMIP/MRI/MRI-JRA55-do-1-4-0/atmos/3hr/prra/gr/v20190429
diff --git a/manifests/input.yaml b/manifests/input.yaml
index 0d32fae..fe4cb4a 100644
--- a/manifests/input.yaml
+++ b/manifests/input.yaml
@@ -327,10 +327,10 @@ work/input/friver_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-4-0_gr_2019010
     binhash: 36d7f4b4cd4d038da099b444d984d0b0
     md5: 8cdb2421fa7056bc3c07577005071f71
 work/input/grid.nc:
-  fullpath: /g/data/vk83/experiments/inputs/access-om3/cice/grids/global.1deg/2020.05.30/grid.nc
+  fullpath: /g/data/vk83/experiments/inputs/access-om3/cice/grids/global.1deg/2024.05.14/grid.nc
   hashes:
-    binhash: c7cb377ba3a6b159b625b5fa3b6ea377
-    md5: 1213e346055ee073fe33dc12578d99c6
+    binhash: 60ac2869d4521fd6441a90b519d9bce0
+    md5: 544a40b634c182f3e182da6bcbe8be7b
 work/input/huss_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-4-0_gr_195801010000-195812312100.nc:
   fullpath: /g/data/qv56/replicas/input4MIPs/CMIP6/OMIP/MRI/MRI-JRA55-do-1-4-0/atmos/3hrPt/huss/gr/v20190429/huss_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-4-0_gr_195801010000-195812312100.nc
   hashes:
@@ -647,10 +647,10 @@ work/input/iced.1900-01-01-10800.nc:
     binhash: a88d7f33c7eef8f6870773f7cc47fc28
     md5: 87c012d60c58c65bb56caa98779e5e51
 work/input/kmt.nc:
-  fullpath: /g/data/vk83/experiments/inputs/access-om3/cice/grids/global.1deg/2020.10.22/kmt.nc
+  fullpath: /g/data/vk83/experiments/inputs/access-om3/cice/grids/global.1deg/2024.05.14/kmt.nc
   hashes:
-    binhash: 0c0a298f90d40f05cf1893efbc2b8083
-    md5: 1f9806c646a620378e5257e480bc9df7
+    binhash: 6fd7a86039ea089fffc371390c14d77a
+    md5: 4dae75252ac93467f10ea26e833e13d2
 work/input/licalvf_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-4-0_gr_19580101-19581231.nc:
   fullpath: /g/data/qv56/replicas/input4MIPs/CMIP6/OMIP/MRI/MRI-JRA55-do-1-4-0/landIce/day/licalvf/gr/v20190429/licalvf_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-4-0_gr_19580101-19581231.nc
   hashes:
diff --git a/nuopc.runconfig b/nuopc.runconfig
index e30485c..7a984e9 100644
--- a/nuopc.runconfig
+++ b/nuopc.runconfig
@@ -311,6 +311,7 @@ ATM_attributes::
 ::
 
 ICE_attributes::
+     eps_imesh = 1e-13 # allowed error between angles in mesh file and cice grid
      Verbosity = off
 ::