Changeset 5099 for LMDZ6/branches/Amaury_dev/tools/netcdf95

Timestamp:

Jul 22, 2024, 9:29:09 PM (4 months ago)

Author:

abarral

Message:

Replace most uses of CPP_DUST by the corresponding logical defined in lmdz_cppkeys_wrapper.F90
Convert several files from .F to .f90 to allow Dust to compile w/o rrtm/ecrad
Create lmdz_yoerad.f90
(lint) Remove "!" on otherwise empty line

Location:

LMDZ6/branches/Amaury_dev/tools/netcdf95

Files:

• Datasets/nf95_find_coord.f90 (modified) (3 diffs)
• Variables/nf95_get_var.f90 (modified) (1 diff)
• Variables/nf95_get_var_array.h (modified) (1 diff)
• Variables/nf95_get_var_scalar.h (modified) (1 diff)

LMDZ6/branches/Amaury_dev/tools/netcdf95/Datasets/nf95_find_coord.f90

@@ -15 +15 @@
     ! attribute "std_name".
 
-    use netcdf, only: NF90_MAX_NAME, NF90_NOERR
+    use netcdf, only: NF90_MAX_NAME, nf90_noerr
     use nf95_get_att_m, only: nf95_get_att
     use nf95_inq_varid_m, only: nf95_inq_varid
@@ -80 +80 @@
        call nf95_inquire_dimension(ncid, dimid_local, name_local)
        call nf95_inq_varid(ncid, name_local, varid_local, ncerr)
-       if (ncerr == NF90_NOERR) then
+       if (ncerr == nf90_noerr) then
           call nf95_inquire_variable(ncid, varid_local, dimids=dimids)
           if (size(dimids) == 1) then
@@ -86 +86 @@
                 ! We have found a coordinate
                 call nf95_get_att(ncid, varid_local, "units", values, ncerr)
-                if (ncerr == NF90_NOERR)then
+                if (ncerr == nf90_noerr)then
                    if (exact) then
                       found = any(values == units)

LMDZ6/branches/Amaury_dev/tools/netcdf95/Variables/nf95_get_var.f90

@@ -1 +1 @@
 module nf95_get_var_m
 
-  use netcdf, only: nf90_get_var, NF90_NOERR
+  use netcdf, only: nf90_get_var, nf90_noerr
   
   use nf95_abort_m, only: nf95_abort

LMDZ6/branches/Amaury_dev/tools/netcdf95/Variables/nf95_get_var_array.h

@@ -16 +16 @@
   end if
 
-  if (ncerr_not_opt == NF90_NOERR .and. present(new_missing)) then
+  if (ncerr_not_opt == nf90_noerr .and. present(new_missing)) then
      call nf95_get_missing(ncid, varid, missing)
      where (values == missing) values = new_missing

LMDZ6/branches/Amaury_dev/tools/netcdf95/Variables/nf95_get_var_scalar.h

@@ -14 +14 @@
   end if
 
-  if (ncerr_not_opt == NF90_NOERR .and. present(new_missing)) then
+  if (ncerr_not_opt == nf90_noerr .and. present(new_missing)) then
      call nf95_get_missing(ncid, varid, missing)
      if (values == missing) values = new_missing