From d2e99a719f4d7a3f4347b476d5e2c02f52b1bc04 Mon Sep 17 00:00:00 2001
From: Sebastien Masson <sebastien.masson@locean.ipsl.fr>
Date: Wed, 4 May 2022 10:10:57 +0000
Subject: [PATCH] Resolve "Missing DOMAIN attributes in multiple file output"

---
 arch/arch-osx_gfortran.fcm    |  2 +-
 cfgs/SHARED/grid_def_nemo.xml | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/arch-osx_gfortran.fcm b/arch/arch-osx_gfortran.fcm
index 081c8d945..5fb2f2826 100644
--- a/arch/arch-osx_gfortran.fcm
+++ b/arch/arch-osx_gfortran.fcm
@@ -35,7 +35,7 @@
 
 %CPP	             cpp -Dkey_nosignedzero 
 %FC	             mpif90 
-%FCFLAGS             -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none
+%FCFLAGS             -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none  -fallow-argument-mismatch 
 %FFLAGS              %FCFLAGS
 %LD                  %FC
 %LDFLAGS             
diff --git a/cfgs/SHARED/grid_def_nemo.xml b/cfgs/SHARED/grid_def_nemo.xml
index 97dadbcd6..d66b314f3 100644
--- a/cfgs/SHARED/grid_def_nemo.xml
+++ b/cfgs/SHARED/grid_def_nemo.xml
@@ -12,7 +12,7 @@
     <domain domain_ref="grid_T" />
   </grid>
   <grid id="grid_T_2D_inner" >
-    <domain domain_ref="grid_T_inner" />
+    <domain domain_ref="grid_T_inner" name="grid_T" />
   </grid>
   <!--  -->
   <grid id="grid_T_ncatice" >
@@ -20,7 +20,7 @@
     <axis axis_ref="ncatice" />
   </grid>
   <grid id="grid_T_ncatice_inner" >
-    <domain domain_ref="grid_T_inner" />
+    <domain domain_ref="grid_T_inner" name="grid_T" />
     <axis axis_ref="ncatice" />
   </grid>
   <!--  -->
@@ -29,7 +29,7 @@
     <axis axis_ref="deptht" />
   </grid>
   <grid id="grid_T_3D_inner" >
-    <domain domain_ref="grid_T_inner" />
+    <domain domain_ref="grid_T_inner" name="grid_T" />
     <axis axis_ref="deptht" />
   </grid>
   <!--  -->
@@ -38,7 +38,7 @@
     <axis axis_ref="profsed" />
   </grid>
   <grid id="grid_T_3DS_inner" >
-    <domain domain_ref="grid_T_inner" />
+    <domain domain_ref="grid_T_inner" name="grid_T" />
     <axis axis_ref="profsed" />
   </grid>
   <!--  -->
@@ -46,7 +46,7 @@
     <domain domain_ref="grid_U" />
   </grid>
   <grid id="grid_U_2D_inner" >
-    <domain domain_ref="grid_U_inner" />
+    <domain domain_ref="grid_U_inner" name="grid_U" />
   </grid>
   <!--  -->
   <grid id="grid_U_3D" >
@@ -54,7 +54,7 @@
     <axis axis_ref="depthu" />
   </grid>
   <grid id="grid_U_3D_inner" >
-    <domain domain_ref="grid_U_inner" />
+    <domain domain_ref="grid_U_inner" name="grid_U" />
     <axis axis_ref="depthu" />
   </grid>
   <!--  -->
@@ -62,7 +62,7 @@
     <domain domain_ref="grid_V" />
   </grid>
   <grid id="grid_V_2D_inner" >
-    <domain domain_ref="grid_V_inner" />
+    <domain domain_ref="grid_V_inner" name="grid_V" />
   </grid>
   <!--  -->
   <grid id="grid_V_3D" >
@@ -70,7 +70,7 @@
     <axis axis_ref="depthv" />
   </grid>
   <grid id="grid_V_3D_inner" >
-    <domain domain_ref="grid_V_inner" />
+    <domain domain_ref="grid_V_inner" name="grid_V" />
     <axis axis_ref="depthv" />
   </grid>
   <!--  -->
@@ -78,7 +78,7 @@
     <domain domain_ref="grid_W" />
   </grid>
   <grid id="grid_W_2D_inner" >
-    <domain domain_ref="grid_W_inner" />
+    <domain domain_ref="grid_W_inner" name="grid_W" />
   </grid>
   <!--  -->
   <grid id="grid_W_3D" >
@@ -86,7 +86,7 @@
     <axis axis_ref="depthw" />
   </grid>
   <grid id="grid_W_3D_inner" >
-    <domain domain_ref="grid_W_inner" />
+    <domain domain_ref="grid_W_inner" name="grid_W" />
     <axis axis_ref="depthw" />
   </grid>
   <!--  -->
@@ -94,7 +94,7 @@
     <domain domain_ref="grid_F" />
   </grid>
   <grid id="grid_F_2D_inner" >
-    <domain domain_ref="grid_F_inner" />
+    <domain domain_ref="grid_F_inner" name="grid_F" />
   </grid>
   <!--  -->
   <grid id="grid_F_3D" >
@@ -102,7 +102,7 @@
     <axis axis_ref="depthf" />
   </grid>
   <grid id="grid_F_3D_inner" >
-    <domain domain_ref="grid_F_inner" />
+    <domain domain_ref="grid_F_inner" name="grid_F" />
     <axis axis_ref="depthf" />
   </grid>
   <!--  -->
-- 
GitLab