Changeset 4259

Timestamp:

Sep 20, 2022, 4:09:50 PM (20 months ago)

Author:

lguez

Message:

Replace nf_put_vara_type by nf90_put_var

The immediate motivation is a bug fix: nf_put_vara_type was called
with scalar instead of array actual arguments for dummy array
arguments start and count. Correcting this, we might as well take the
opportunity to use nf90_put_var, so we no longer need to test
NC_DOUBLE and we have half as many calls.

Location:

LMDZ6/trunk/libf

Files:

• dyn3d_common/grilles_gcm_netcdf_sub.F90 (modified) (5 diffs)
• phylmd/iotd_ecrit.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90

@@ -11 +11 @@
   USE comconst_mod, ONLY: cpp, kappa, g, omeg, daysec, rad, pi
   USE comvert_mod, ONLY: presnivs, preff, pa
-  use netcdf, only: nf90_def_var, nf90_int, nf90_float
+  use netcdf, only: nf90_def_var, nf90_int, nf90_float, nf90_put_var
   
   IMPLICIT NONE
@@ -147 +147 @@
   ! rajoute l'ecriture de la grille
 
-#ifdef NC_DOUBLE
-  status=NF_PUT_VARA_DOUBLE(ncid_out,out_lonuid,1,iim+1,rlonudeg)
-  CALL handle_err(status)
-  status=NF_PUT_VARA_DOUBLE(ncid_out,out_lonvid,1,iim+1,rlonvdeg)
-  CALL handle_err(status)
-  status=NF_PUT_VARA_DOUBLE(ncid_out,out_latuid,1,jjm+1,rlatudeg)
-  CALL handle_err(status)
-  status=NF_PUT_VARA_DOUBLE(ncid_out,out_latvid,1,jjm,rlatvdeg)
-  CALL handle_err(status)
-#else
-  status=NF_PUT_VARA_REAL(ncid_out,out_lonuid,1,iim+1,rlonudeg)
-  CALL handle_err(status)
-  status=NF_PUT_VARA_REAL(ncid_out,out_lonvid,1,iim+1,rlonvdeg)
-  CALL handle_err(status)
-  status=NF_PUT_VARA_REAL(ncid_out,out_latuid,1,jjm+1,rlatudeg)
-  CALL handle_err(status)
-  status=NF_PUT_VARA_REAL(ncid_out,out_latvid,1,jjm,rlatvdeg)
-  CALL handle_err(status)
-#endif
+  status=NF90_PUT_VAR(ncid_out,out_lonuid,rlonudeg,[1],[iim+1])
+  CALL handle_err(status)
+  status=NF90_PUT_VAR(ncid_out,out_lonvid,rlonvdeg,[1],[iim+1])
+  CALL handle_err(status)
+  status=NF90_PUT_VAR(ncid_out,out_latuid,rlatudeg,[1],[jjm+1])
+  CALL handle_err(status)
+  status=NF90_PUT_VAR(ncid_out,out_latvid,rlatvdeg,[1],[jjm])
+  CALL handle_err(status)
 
   start(1)=1
@@ -183 +172 @@
   ENDDO
 
-#ifdef NC_DOUBLE
-  status=NF_PUT_VARA_DOUBLE(ncid_out,out_varid,start, count,temp)
-  CALL handle_err(status)
-#else
-  status=NF_PUT_VARA_REAL(ncid_out,out_varid,start, count,temp)
-  CALL handle_err(status)
-#endif
+  status=NF90_PUT_VAR(ncid_out,out_varid,temp,start, count)
+  CALL handle_err(status)
 
   ! On re-ouvre le fichier pour rajouter 4 nouvelles variables necessaire pour INCA
@@ -221 +205 @@
 
   ! ecriture des variables
-#ifdef NC_DOUBLE
-  status=NF_PUT_VARA_DOUBLE(ncid_out,presnivs_id,1,llm,rlevdeg)
-  CALL handle_err(status)
-#else
-  status=NF_PUT_VARA_REAL(ncid_out,presnivs_id,1,llm,rlevdeg)
-  CALL handle_err(status)
-#endif
+  status=NF90_PUT_VAR(ncid_out,presnivs_id,rlevdeg,[1],[llm])
+  CALL handle_err(status)
 
   start(1)=1
@@ -238 +217 @@
   COUNT(4)=0
 
-  status = nf_put_vara_double(ncid_out, phis_id,start,count, phis_loc)
-  CALL handle_err(status)
-  status = nf_put_vara_double(ncid_out, area_id,start,count, aire)
+  status = nf90_put_var(ncid_out, phis_id, phis_loc,start,count)
+  CALL handle_err(status)
+  status = nf90_put_var(ncid_out, area_id, aire,start,count)
   CALL handle_err(status)
   masque_int(:,:) = nINT(masque(:,:))
-  status = nf_put_vara_int(ncid_out, mask_id,start,count,masque_int)
+  status = nf90_put_var(ncid_out, mask_id,masque_int,start,count)
   CALL handle_err(status)
   

LMDZ6/trunk/libf/phylmd/iotd_ecrit.F90

@@ -22 +22 @@
 !=================================================================
  
+      use netcdf, only: nf90_put_var
       implicit none
 
@@ -108 +109 @@
 
 
-           ierr= NF_PUT_VARA_REAL(nid,varid,ntime,1,date)
+           ierr= NF90_PUT_VAR(nid,varid,date,[ntime])
 
 !          print*,'date ',date,ierr,nid
@@ -172 +173 @@
 
 
-      ierr= NF_PUT_VARA_REAL(nid,varid,corner,edges,zx)
+      ierr= NF90_PUT_VAR(nid,varid,zx,corner,edges)
 
       if (ierr.ne.NF_NOERR) then