Changeset 4274 for LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read_std.F90

Timestamp:

Sep 21, 2022, 3:12:15 PM (20 months ago)

Author:

lguez

Message:

Replace nf_get_var_type by nf90_get_var

The immediate motivation is a bug fix: nf_get_var_type was called
with scalar resul3 or lat, lon, alt, phis instead of array actual
argument for dummy array argument rvals or dvals. Correcting this, we
might as well take the opportunity to use nf90_get_var, so we no
longer need to test NC_DOUBLE and we have half as many calls.

File:

• LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read_std.F90 (modified) (8 diffs)

LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read_std.F90

@@ -87 +87 @@
   !**********************************************************************************************
   SUBROUTINE read_SCM_cas
+    use netcdf, only: nf90_get_var
     implicit none
 
@@ -146 +147 @@
     else
        allocate(time_val(nt_cas))
-#ifdef NC_DOUBLE
-       ierr = NF_GET_VAR_DOUBLE(nid,timeid,time_val)
-#else
-       ierr = NF_GET_VAR_REAL(nid,timeid,time_val)
-#endif
+       ierr = NF90_GET_VAR(nid,timeid,time_val)
        if(ierr/=NF_NOERR) then
           print *,'Pb a la lecture de time cas.nc: '
@@ -332 +329 @@
 
     !program reading forcing of the case study
+    use netcdf, only: nf90_get_var
     implicit none
 #include "netcdf.inc"
@@ -458 +456 @@
           !-----------------------------------------------------------------------
           if(i.LE.4) then
-#ifdef NC_DOUBLE
-             ierr = NF_GET_VAR_DOUBLE(nid,var3didin(i),apbp)
-#else
-             ierr = NF_GET_VAR_REAL(nid,var3didin(i),apbp)
-#endif
+             ierr = NF90_GET_VAR(nid,var3didin(i),apbp)
              print *,'read2_cas(apbp), on a lu ',i,name_var(i)
              if(ierr/=NF_NOERR) then
@@ -473 +467 @@
              !-----------------------------------------------------------------------
           else if(i.gt.4.and.i.LE.12) then  
-#ifdef NC_DOUBLE
-             ierr = NF_GET_VAR_DOUBLE(nid,var3didin(i),resul1)
-#else
-             ierr = NF_GET_VAR_REAL(nid,var3didin(i),resul1)
-#endif
+             ierr = NF90_GET_VAR(nid,var3didin(i),resul1)
              print *,'read2_cas(resul1), on a lu ',i,name_var(i)
              if(ierr/=NF_NOERR) then
@@ -490 +480 @@
              !-----------------------------------------------------------------------
           else if(i.gt.12.and.i.LE.61) then
-#ifdef NC_DOUBLE
-             ierr = NF_GET_VAR_DOUBLE(nid,var3didin(i),resul)
-#else
-             ierr = NF_GET_VAR_REAL(nid,var3didin(i),resul)
-#endif
+             ierr = NF90_GET_VAR(nid,var3didin(i),resul)
              print *,'read2_cas(resul), on a lu ',i,name_var(i)
              if(ierr/=NF_NOERR) then
@@ -506 +492 @@
              !-----------------------------------------------------------------------
           else if (i.gt.62.and.i.LE.75) then
-#ifdef NC_DOUBLE
-             ierr = NF_GET_VAR_DOUBLE(nid,var3didin(i),resul2)
-#else
-             ierr = NF_GET_VAR_REAL(nid,var3didin(i),resul2)
-#endif
+             ierr = NF90_GET_VAR(nid,var3didin(i),resul2)
              print *,'read2_cas(resul2), on a lu ',i,name_var(i)
              if(ierr/=NF_NOERR) then
@@ -522 +504 @@
              !-----------------------------------------------------------------------
           else
-#ifdef NC_DOUBLE
-             ierr = NF_GET_VAR_DOUBLE(nid,var3didin(i),resul3)
-#else
-             ierr = NF_GET_VAR_REAL(nid,var3didin(i),resul3)
-#endif
+             ierr = NF90_GET_VAR(nid,var3didin(i),resul3)
              print *,'read2_cas(resul3), on a lu ',i,name_var(i)
              if(ierr/=NF_NOERR) then