Changeset 5249 for LMDZ6/trunk/libf/phylmd/Dust

Timestamp:

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

Author:

abarral

Message:

Replace uses of cpp key NC_DOUBLE

Location:

LMDZ6/trunk/libf/phylmd/Dust

Files:

• read_dust.F90 (modified) (2 diffs)
• read_surface.F90 (modified) (2 diffs)
• read_vent.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/Dust/read_dust.F90

@@ -3 +3 @@
   USE mod_grid_phy_lmdz
   USE mod_phys_lmdz_para
+  USE netcdf, ONLY: nf90_get_var
   IMPLICIT NONE
   !
@@ -46 +47 @@
   start(3)=step
   !
-#ifdef NC_DOUBLE
-   ! status=NF_GET_VARA_DOUBLE(ncid1,varid1,start,count,dust_nc)
-  status=NF_GET_VARA_DOUBLE(ncid1,varid1,start,count,dust_nc_glo)
-#else
-   ! status=NF_GET_VARA_REAL(ncid1,varid1,start,count,dust_nc)
-  status=NF_GET_VARA_REAL(ncid1,varid1,start,count,dust_nc_glo)
-#endif
+  status = nf90_get_var(ncid1, varid1, dust_nc_glo, start, count)
+
   !
   !  call correctbid(iim,jjp1,dust_nc)

LMDZ6/trunk/libf/phylmd/Dust/read_surface.F90

@@ -75 +75 @@
       varid=NCVID(ncid,latstr,rcode)
 
-#ifdef NC_DOUBLE
-          status=NF_GET_VARA_DOUBLE(ncid,varid,startj,endj,lats_glo)
-#else
-          status=NF_GET_VARA_REAL(ncid,varid,startj,endj,lats_glo)
-#endif
+          status = nf90_get_var(ncid, varid, lats_glo, startj, endj)
 !      print *,latstr,varid,status,jjp1,rcode
 !      IF (status .NE. NF_NOERR) print*,'NOOOOOOO'
@@ -113 +109 @@
 ! Lecture
 ! -----------------------
-#ifdef NC_DOUBLE
-          status=NF_GET_VARA_DOUBLE(ncid,varid,start,count,tmp_dyn_glo)
-#else
-          status=NF_GET_VARA_REAL(ncid,varid,start,count,tmp_dyn_glo)
-#endif
+          status = nf90_get_var(ncid, varid, tmp_dyn_glo, start, count)
 
 !      call dump2d(iip1,jjp1,tmp_dyn,'tmp_dyn   ')

LMDZ6/trunk/libf/phylmd/Dust/read_vent.F90

@@ -52 +52 @@
   start(3)=step
   !
-#ifdef NC_DOUBLE
-   ! status=NF_GET_VARA_DOUBLE(ncidu1,varidu1,start,count,u10m_nc)
-  status=NF_GET_VARA_DOUBLE(ncidu1,varidu1,start,count,u10m_nc_glo)
-#else
-   ! status=NF_GET_VARA_REAL(ncidu1,varidu1,start,count,u10m_nc)
-  status=NF_GET_VARA_REAL(ncidu1,varidu1,start,count,u10m_nc_glo)
-#endif
+  status = nf90_get_var(ncidu1, varidu1, u10m_nc_glo, start, count)
+
     ! print *,status
   !
-#ifdef NC_DOUBLE
-   ! status=NF_GET_VARA_DOUBLE(ncidv1,varidv1,start,count,v10m_nc)
-  status=NF_GET_VARA_DOUBLE(ncidv1,varidv1,start,count,v10m_nc_glo)
-#else
-   ! status=NF_GET_VARA_REAL(ncidv1,varidv1,start,count,v10m_nc)
-  status=NF_GET_VARA_REAL(ncidv1,varidv1,start,count,v10m_nc_glo)
-#endif
+  status = nf90_get_var(ncidv1, varidv1, v10m_nc_glo, start, count)
+
   !