Changeset 5099 for LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90

Timestamp:

Jul 22, 2024, 9:29:09 PM (2 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

File:

• LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90 (modified) (4 diffs)

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90

@@ -1 @@
-!
+
 ! $Id: iniacademic.F90 1625 2012-05-09 13:14:48Z lguez $
-!
+
 SUBROUTINE iniacademic_loc(vcov,ucov,teta,q,masse,ps,phis,time_0)
 
@@ -23 +23 @@
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
   USE readTracFiles_mod, ONLY: addPhase
-  use netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID,NF90_CLOSE, NF90_GET_VAR
+  use netcdf, only : NF90_NOWRITE,NF90_OPEN,nf90_noerr,NF90_INQ_VARID,NF90_CLOSE, nf90_get_var
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -100 +100 @@
   ! 1. Initializations for Earth-like case
   ! --------------------------------------
-  !
+
   ! initialize planet radius, rotation rate,...
   call conf_planete
@@ -153 +153 @@
      relief=0.
      ierr = NF90_OPEN ('relief_in.nc', NF90_NOWRITE,nid_relief)
-     if (ierr==NF90_NOERR) THEN
+     if (ierr==nf90_noerr) THEN
          ierr=NF90_INQ_VARID(nid_relief,'RELIEF',varid)
-         if (ierr==NF90_NOERR) THEN
-              ierr=NF90_GET_VAR(nid_relief,varid,relief(1:iim,1:jjp1))
+         if (ierr==nf90_noerr) THEN
+              ierr=nf90_get_var(nid_relief,varid,relief(1:iim,1:jjp1))
               relief(iip1,:)=relief(1,:)
          else