From e0c923554b13bbcb5a8f9f1f705c23f2604ffcce Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Wed, 17 Apr 2024 14:57:05 +0200
Subject: [PATCH] Philippe 17/04/2024: output: boxes: rename the dimensions to
be similar to the main domain ones (allowed by CF conventions)
---
src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90 | 32 ++++++++++-----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90 b/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
index d60ce3f8a..64286bee2 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
@@ -401,14 +401,14 @@ if ( tpfile%ctype == 'MNHOUTPUT' ) then
Allocate( tpfile%tboxncdims(jbox)%tdims(NMNHDIM_BOX_FIRST_ENTRY:NMNHDIM_BOX_LAST_ENTRY) )
!Write the box dimensions
- call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NI, 'box_ni', tout_boxes(jbox)%nisup-tout_boxes(jbox)%niinf+1 )
- call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NI_U, 'box_ni_u', tout_boxes(jbox)%nisup-tout_boxes(jbox)%niinf+1 )
- call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NI_V, 'box_ni_v', tout_boxes(jbox)%nisup-tout_boxes(jbox)%niinf+1 )
- call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NJ, 'box_nj', tout_boxes(jbox)%njsup-tout_boxes(jbox)%njinf+1 )
- call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NJ_U, 'box_nj_u', tout_boxes(jbox)%njsup-tout_boxes(jbox)%njinf+1 )
- call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NJ_V, 'box_nj_v', tout_boxes(jbox)%njsup-tout_boxes(jbox)%njinf+1 )
- call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_LEVEL, 'box_level', tout_boxes(jbox)%nksup-tout_boxes(jbox)%nkinf+1 )
- call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_LEVEL_W, 'box_level_w', tout_boxes(jbox)%nksup-tout_boxes(jbox)%nkinf+1 )
+ call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NI, 'ni', tout_boxes(jbox)%nisup-tout_boxes(jbox)%niinf+1 )
+ call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NI_U, 'ni_u', tout_boxes(jbox)%nisup-tout_boxes(jbox)%niinf+1 )
+ call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NI_V, 'ni_v', tout_boxes(jbox)%nisup-tout_boxes(jbox)%niinf+1 )
+ call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NJ, 'nj', tout_boxes(jbox)%njsup-tout_boxes(jbox)%njinf+1 )
+ call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NJ_U, 'nj_u', tout_boxes(jbox)%njsup-tout_boxes(jbox)%njinf+1 )
+ call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_NJ_V, 'nj_v', tout_boxes(jbox)%njsup-tout_boxes(jbox)%njinf+1 )
+ call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_LEVEL, 'level', tout_boxes(jbox)%nksup-tout_boxes(jbox)%nkinf+1 )
+ call IO_Add_dim_box_nc4( tpfile, jbox, NMNHDIM_BOX_LEVEL_W, 'level_w', tout_boxes(jbox)%nksup-tout_boxes(jbox)%nkinf+1 )
!Write the box attributes
call IO_box_attribute_write_nc4( tpfile, jbox, 'min_I_index_in_physical_domain', tout_boxes(jbox)%niinf )
@@ -753,21 +753,21 @@ if ( Any( tpfield%ndimlist(:) /= NMNHDIM_UNKNOWN ) ) then
if ( tpfield%ndimlist(ji) >= NMNHDIM_BOX_FIRST_ENTRY .AND. tpfield%ndimlist(ji) <= NMNHDIM_BOX_LAST_ENTRY ) then
select case ( tpfield%ndimlist(ji) )
case ( NMNHDIM_BOX_NI )
- call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'box_ni', tpfield%cmnhname, kshape(ji), kvdims(ji))
+ call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'ni', tpfield%cmnhname, kshape(ji), kvdims(ji))
case ( NMNHDIM_BOX_NJ )
- call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'box_nj', tpfield%cmnhname, kshape(ji), kvdims(ji))
+ call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'nj', tpfield%cmnhname, kshape(ji), kvdims(ji))
case ( NMNHDIM_BOX_NI_U )
- call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'box_ni_u', tpfield%cmnhname, kshape(ji), kvdims(ji))
+ call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'ni_u', tpfield%cmnhname, kshape(ji), kvdims(ji))
case ( NMNHDIM_BOX_NJ_U )
- call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'box_nj_u', tpfield%cmnhname, kshape(ji), kvdims(ji))
+ call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'nj_u', tpfield%cmnhname, kshape(ji), kvdims(ji))
case ( NMNHDIM_BOX_NI_V )
- call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'box_ni_v', tpfield%cmnhname, kshape(ji), kvdims(ji))
+ call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'ni_v', tpfield%cmnhname, kshape(ji), kvdims(ji))
case ( NMNHDIM_BOX_NJ_V )
- call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'box_nj_v', tpfield%cmnhname, kshape(ji), kvdims(ji))
+ call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'nj_v', tpfield%cmnhname, kshape(ji), kvdims(ji))
case ( NMNHDIM_BOX_LEVEL )
- call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'box_level', tpfield%cmnhname, kshape(ji), kvdims(ji))
+ call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'level', tpfield%cmnhname, kshape(ji), kvdims(ji))
case ( NMNHDIM_BOX_LEVEL_W )
- call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'box_level_w', tpfield%cmnhname, kshape(ji), kvdims(ji))
+ call IO_Dim_localgroup_check( tpfile%nncid, tpfield%ndimlist(ji), 'level_w', tpfield%cmnhname, kshape(ji), kvdims(ji))
case default
call Print_msg( NVERB_FATAL, 'IO', 'IO_Vdims_fill_nc4', 'invalid box dimension' )
end select
--
GitLab