Changeset 5068

Timestamp:

Jul 18, 2024, 12:14:04 PM (7 weeks ago)

Author:

abarral

Message:

[to be continued, but should be stable]
Create lmdz_netcdf.F90 as a wrapper around netcdf, to

1) expose netcdf as a pure Fortran module (rather than module + include header)
2) handle NC_DOUBLE in a centralized way

Use said module in dynredem_mod.F90, guide_mod.F90

Location:

LMDZ6/trunk/libf

Files:

• dyn3d/dynredem_mod.F90 (modified) (2 diffs)
• dyn3d/guide_mod.F90 (modified) (7 diffs)
• misc/lmdz_netcdf.F90 (added)

LMDZ6/trunk/libf/dyn3d/dynredem_mod.F90

@@ -94 +94 @@
 !
 !===============================================================================
+  USE lmdz_netcdf, ONLY: NF90_FORMAT
   IMPLICIT NONE
 !===============================================================================
@@ -102 +103 @@
   CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: units
 !===============================================================================
-#ifdef NC_DOUBLE
-  CALL err(NF90_DEF_VAR(ncid,var,NF90_DOUBLE,did,nvarid),"inq",var)
-#else
-  CALL err(NF90_DEF_VAR(ncid,var,NF90_FLOAT ,did,nvarid),"inq",var)
-#endif
+  CALL err(NF90_DEF_VAR(ncid,var,NF90_FORMAT,did,nvarid),"inq",var)
   IF(title/="")      CALL err(NF90_PUT_ATT(ncid,nvarid,"title",title),var)
   IF(PRESENT(units)) CALL err(NF90_PUT_ATT(ncid,nvarid,"units",units),var)

LMDZ6/trunk/libf/dyn3d/guide_mod.F90

@@ -9 +9 @@
 !=======================================================================
 
-  USE getparam, only: ini_getparam, fin_getparam, getpar
+  USE getparam, ONLY: ini_getparam, fin_getparam, getpar
   USE Write_Field
-  use netcdf, only: nf90_nowrite, nf90_open, nf90_inq_varid, nf90_close, &
-                    nf90_inq_dimid, nf90_inquire_dimension
-  use pres2lev_mod, only: pres2lev
+  USE lmdz_netcdf, ONLY: nf90_nowrite, nf90_open, nf90_inq_varid, nf90_close, &
+          nf90_inq_dimid, nf90_inquire_dimension, nf_put_var_rd, nf90_float, nf90_def_var, &
+          nf_create, nf_def_dim, nf_open, nf_unlimited, nf_write, nf_enddef, nf_redef, &
+          nf_close, nf_inq_varid, nf_put_vara_rd, nf90_get_var, nf90_noerr, nf_clobber, &
+          nf_64bit_offset, nf_inq_dimid, nf_inq_dimlen
+  USE pres2lev_mod, ONLY: pres2lev
 
   IMPLICIT NONE
@@ -77 +80 @@
     INCLUDE "dimensions.h"
     INCLUDE "paramet.h"
-    INCLUDE "netcdf.inc"
 
     INTEGER                :: error,ncidpl,rid,rcod
@@ -1089 +1091 @@
 !=======================================================================
   SUBROUTINE guide_read(timestep)
-
-    use netcdf, only: NF90_GET_VAR, nf90_noerr
-
     IMPLICIT NONE
 
@@ -1389 +1388 @@
 !=======================================================================
   SUBROUTINE guide_read2D(timestep)
-
-    use netcdf, only: nf90_get_var, nf90_noerr
-
     IMPLICIT NONE
 
@@ -1653 +1649 @@
     USE comconst_mod, ONLY: pi
     USE comvert_mod, ONLY: presnivs
-    use netcdf95, only: nf95_def_var, nf95_put_var
-    use netcdf, only: nf90_float, nf90_def_var
-    
+    USE netcdf95, ONLY: nf95_def_var, nf95_put_var
+
     IMPLICIT NONE
 
     INCLUDE "dimensions.h"
     INCLUDE "paramet.h"
-    INCLUDE "netcdf.inc"
     INCLUDE "comgeom2.h"
     
@@ -1713 +1707 @@
 
 ! Enregistrement des variables dimensions
-#ifdef NC_DOUBLE
-        ierr = NF_PUT_VAR_DOUBLE(nid,vid_lonu,rlonu*180./pi)
-        ierr = NF_PUT_VAR_DOUBLE(nid,vid_lonv,rlonv*180./pi)
-        ierr = NF_PUT_VAR_DOUBLE(nid,vid_latu,rlatu*180./pi)
-        ierr = NF_PUT_VAR_DOUBLE(nid,vid_latv,rlatv*180./pi)
-        ierr = NF_PUT_VAR_DOUBLE(nid,vid_lev,presnivs)
-        ierr = NF_PUT_VAR_DOUBLE(nid,vid_cu,cu)
-        ierr = NF_PUT_VAR_DOUBLE(nid,vid_cv,cv)
-        ierr = NF_PUT_VAR_DOUBLE(nid,vid_au,alpha_u)
-        ierr = NF_PUT_VAR_DOUBLE(nid,vid_av,alpha_v)
-#else
-        ierr = NF_PUT_VAR_REAL(nid,vid_lonu,rlonu*180./pi)
-        ierr = NF_PUT_VAR_REAL(nid,vid_lonv,rlonv*180./pi)
-        ierr = NF_PUT_VAR_REAL(nid,vid_latu,rlatu*180./pi)
-        ierr = NF_PUT_VAR_REAL(nid,vid_latv,rlatv*180./pi)
-        ierr = NF_PUT_VAR_REAL(nid,vid_lev,presnivs)
-        ierr = NF_PUT_VAR_REAL(nid,vid_cu,cu)
-        ierr = NF_PUT_VAR_REAL(nid,vid_cv,cv)
-        ierr = NF_PUT_VAR_REAL(nid,vid_au,alpha_u)
-        ierr = NF_PUT_VAR_REAL(nid,vid_av,alpha_v)
-#endif
+        ierr = nf_put_var_rd(nid,vid_lonu,rlonu*180./pi)
+        ierr = nf_put_var_rd(nid,vid_lonv,rlonv*180./pi)
+        ierr = nf_put_var_rd(nid,vid_latu,rlatu*180./pi)
+        ierr = nf_put_var_rd(nid,vid_latv,rlatv*180./pi)
+        ierr = nf_put_var_rd(nid,vid_lev,presnivs)
+        ierr = nf_put_var_rd(nid,vid_cu,cu)
+        ierr = nf_put_var_rd(nid,vid_cv,cv)
+        ierr = nf_put_var_rd(nid,vid_au,alpha_u)
+        ierr = nf_put_var_rd(nid,vid_av,alpha_v)
         call nf95_put_var(nid, varid_alpha_t, alpha_t)
         call nf95_put_var(nid, varid_alpha_q, alpha_q)
@@ -1807 +1789 @@
     END SELECT
 
-
-#ifdef NC_DOUBLE
-    ierr = NF_PUT_VARA_DOUBLE(nid,varid,start,count,field2)
-#else
-    ierr = NF_PUT_VARA_REAL(nid,varid,start,count,field2)
-#endif
-
+    ierr = nf_put_vara_rd(nid,varid,start,count,field2)
     ierr = NF_CLOSE(nid)