diff --git a/src/LIB/SURCOUCHE/src/modd_netcdf.f90 b/src/LIB/SURCOUCHE/src/modd_netcdf.f90 index 6b0c890a222eba1743a271f3eeba86c51ab81d01..022ee3912b3b24c549c1020c3ed771edff862dd9 100644 --- a/src/LIB/SURCOUCHE/src/modd_netcdf.f90 +++ b/src/LIB/SURCOUCHE/src/modd_netcdf.f90 @@ -24,7 +24,7 @@ TYPE DIMCDF TYPE(DIMCDF), POINTER :: NEXT => NULL() END TYPE DIMCDF -TYPE(DIMCDF),DIMENSION(3,0:7) :: NCOORDID !X,Y,Z coordinates for the 8 Arakawa points +TYPE(DIMCDF),DIMENSION(3,0:8) :: NCOORDID !X,Y,Z coordinates for the Arakawa points !0 2nd-dimension is to treat NGRID=0 case without crash END MODULE MODD_NETCDF diff --git a/src/LIB/SURCOUCHE/src/mode_netcdf.f90 b/src/LIB/SURCOUCHE/src/mode_netcdf.f90 index 800498bc580341d574330ddebad0d2f5bdf77c8d..bda97e58d5dd0b3d312249ef4eb2413d6ac42b1b 100644 --- a/src/LIB/SURCOUCHE/src/mode_netcdf.f90 +++ b/src/LIB/SURCOUCHE/src/mode_netcdf.f90 @@ -140,7 +140,7 @@ IF (.NOT. ASSOCIATED(PIOCDF%DIM_LEVEL_W)) PIOCDF%DIM_LEVEL_W => GETDIMCDF(TPFILE IF (.NOT. ASSOCIATED(PIOCDF%DIMTIME)) PIOCDF%DIMTIME => GETDIMCDF(TPFILE, NF90_UNLIMITED, 'time') -! Store X,Y,Z coordinates for the 4 Arakawa points +! Store X,Y,Z coordinates for the Arakawa points ! Mass point NCOORDID(1,1) = PIOCDF%DIM_NI NCOORDID(2,1) = PIOCDF%DIM_NJ @@ -163,12 +163,16 @@ NCOORDID(2,5) = PIOCDF%DIM_NJ_V NCOORDID(3,5) = PIOCDF%DIM_LEVEL ! eta vorticity point (=uw point) NCOORDID(1,6) = PIOCDF%DIM_NI_U -NCOORDID(2,6) = PIOCDF%DIM_NJ +NCOORDID(2,6) = PIOCDF%DIM_NJ_U NCOORDID(3,6) = PIOCDF%DIM_LEVEL_W -! xi vorticity point (=vw point) -NCOORDID(1,7) = PIOCDF%DIM_NI +! zeta vorticity point (=vw point) +NCOORDID(1,7) = PIOCDF%DIM_NI_V NCOORDID(2,7) = PIOCDF%DIM_NJ_V NCOORDID(3,7) = PIOCDF%DIM_LEVEL_W +! fw point (=uvw point) +NCOORDID(1,8) = PIOCDF%DIM_NI_U +NCOORDID(2,8) = PIOCDF%DIM_NJ_V +NCOORDID(3,8) = PIOCDF%DIM_LEVEL_W END SUBROUTINE IO_SET_KNOWNDIMS_NC4 @@ -687,7 +691,7 @@ ELSE END IF END IF ! -IF(IGRID<0 .OR. IGRID>7) THEN +IF(IGRID<0 .OR. IGRID>8) THEN WRITE(YINT,'( I0 )') IGRID CALL PRINT_MSG(NVERB_FATAL,'IO','FILLVDIMS','invalid NGRID ('//TRIM(YINT)//') for field '//TRIM(TPFIELD%CMNHNAME)) END IF