Changeset 5249 for LMDZ6/trunk/libf/dyn3d

Timestamp:

Oct 22, 2024, 11:35:08 AM (8 months ago)

Author:

abarral

Message:

Replace uses of cpp key NC_DOUBLE

Location:

LMDZ6/trunk/libf/dyn3d

Files:

• dynredem_mod.F90 (modified) (1 diff)
• guide_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/dyn3d/dynredem_mod.F90 ¶

@@ -92 +92 @@
 !
 SUBROUTINE cre_var(ncid,var,title,did,units)
-!
-!===============================================================================
-  IMPLICIT NONE
-!===============================================================================
-! Arguments:
+  USE lmdz_cppkeys_wrapper, ONLY: nf90_format
+  IMPLICIT NONE
+
   INTEGER,                    INTENT(IN) :: ncid
   CHARACTER(LEN=*),           INTENT(IN) :: var, title
   INTEGER,                    INTENT(IN) :: did(:)
   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)
-
 END SUBROUTINE cre_var
 !

LMDZ6/trunk/libf/dyn3d/guide_mod.F90 ¶

@@ -1654 +1654 @@
     USE comvert_mod, ONLY: presnivs
     use netcdf95, only: nf95_def_var, nf95_put_var
-    use netcdf, only: nf90_float, nf90_def_var
+    use netcdf, only: nf90_float, nf90_def_var, nf90_put_var
     
     IMPLICIT NONE
@@ -1713 +1713 @@
 
 ! 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 = nf90_put_var(nid, vid_lonu, rlonu * 180. / pi)
+         ierr = nf90_put_var(nid, vid_lonv, rlonv * 180. / pi)
+         ierr = nf90_put_var(nid, vid_latu, rlatu * 180. / pi)
+         ierr = nf90_put_var(nid, vid_latv, rlatv * 180. / pi)
+         ierr = nf90_put_var(nid, vid_lev, presnivs)
+         ierr = nf90_put_var(nid, vid_cu, cu)
+         ierr = nf90_put_var(nid, vid_cv, cv)
+         ierr = nf90_put_var(nid, vid_au, alpha_u)
+         ierr = nf90_put_var(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)
@@ -1808 +1799 @@
 
 
-#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 = nf90_put_var(nid, varid, field2, start, count)
     ierr = NF_CLOSE(nid)