Changeset 5099 for LMDZ6/branches/Amaury_dev/libf/dyn3d/dynetat0.F90

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

File:

• LMDZ6/branches/Amaury_dev/libf/dyn3d/dynetat0.F90 (modified) (10 diffs)

LMDZ6/branches/Amaury_dev/libf/dyn3d/dynetat0.F90

@@ -1 +1 @@
 SUBROUTINE dynetat0(fichnom,vcov,ucov,teta,q,masse,ps,phis,time)
-!
+
 !-------------------------------------------------------------------------------
 ! Authors: P. Le Van , L.Fairhead
@@ -9 +9 @@
   USE strings_mod, ONLY: maxlen, msg, strStack, real2str, int2str
   USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQ_VARID, &
-                         NF90_CLOSE, NF90_GET_VAR, NF90_NoErr
+                         NF90_CLOSE, nf90_get_var, nf90_noerr
   USE readTracFiles_mod, ONLY: new2oldH2O, newHNO3, oldHNO3, getKey
   USE control_mod, ONLY: planet_type
@@ -82 +82 @@
   pa         = tab_cntrl(idecal+13)
   preff      = tab_cntrl(idecal+14)
-!
+
   clon       = tab_cntrl(idecal+15)
   clat       = tab_cntrl(idecal+16)
   grossismx  = tab_cntrl(idecal+17)
   grossismy  = tab_cntrl(idecal+18)
-!
+
   IF ( tab_cntrl(idecal+19)==1. )  THEN
     fxyhypb  = .TRUE.
@@ -116 +116 @@
   CALL get_var2("aire" ,aire)
   var="temps"
-  IF(NF90_INQ_VARID(fID,var,vID)/=NF90_NoErr) THEN
+  IF(NF90_INQ_VARID(fID,var,vID)/=nf90_noerr) THEN
     CALL msg('missing field <temps> ; trying with <Time>', modname)
     var="Time"
     CALL err(NF90_INQ_VARID(fID,var,vID),"inq",var)
   END IF
-  CALL err(NF90_GET_VAR(fID,vID,time),"get",var)
+  CALL err(nf90_get_var(fID,vID,time),"get",var)
   CALL get_var2("phisinit",phis)
   CALL get_var3("ucov",ucov)
@@ -132 +132 @@
   ll=.FALSE.
 #ifdef REPROBUS
-  ll = NF90_INQ_VARID(fID, 'HNO3tot', vID) /= NF90_NoErr                                 !--- DETECT OLD REPRO start.nc FILE
+  ll = NF90_INQ_VARID(fID, 'HNO3tot', vID) /= nf90_noerr                                 !--- DETECT OLD REPRO start.nc FILE
 #endif
   DO iq=1,nqtot
@@ -145 +145 @@
     END IF
     !--------------------------------------------------------------------------------------------------------------------------
-    IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lSkip) THEN                !=== REGULAR CASE: AVAILABLE VARIABLE
-      CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",var)
-    !--------------------------------------------------------------------------------------------------------------------------
-    ELSE IF(NF90_INQ_VARID(fID, oldVar, vID) == NF90_NoErr) THEN                         !=== TRY WITH ALTERNATE NAME
+    IF(NF90_INQ_VARID(fID, var, vID) == nf90_noerr .AND. .NOT.lSkip) THEN                !=== REGULAR CASE: AVAILABLE VARIABLE
+      CALL err(nf90_get_var(fID,vID,q(:,:,:,iq)),"get",var)
+    !--------------------------------------------------------------------------------------------------------------------------
+    ELSE IF(NF90_INQ_VARID(fID, oldVar, vID) == nf90_noerr) THEN                         !=== TRY WITH ALTERNATE NAME
       CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to <'//TRIM(oldVar)//'>', modname)
-      CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",oldVar)
+      CALL err(nf90_get_var(fID,vID,q(:,:,:,iq)),"get",oldVar)
     !--------------------------------------------------------------------------------------------------------------------------
     ELSE IF(tracers(iq)%iso_iGroup == iH2O .AND. niso > 0) THEN                          !=== WATER ISOTOPES
@@ -209 +209 @@
   REAL,             INTENT(OUT) :: v(:)
   CALL err(NF90_INQ_VARID(fID,var,vID),"inq",var)
-  CALL err(NF90_GET_VAR(fID,vID,v),"get",var)
+  CALL err(nf90_get_var(fID,vID,v),"get",var)
 END SUBROUTINE get_var1
 
@@ -217 +217 @@
   REAL,             INTENT(OUT) :: v(:,:)
   CALL err(NF90_INQ_VARID(fID,var,vID),"inq",var)
-  CALL err(NF90_GET_VAR(fID,vID,v),"get",var)
+  CALL err(nf90_get_var(fID,vID,v),"get",var)
 END SUBROUTINE get_var2
 
@@ -225 +225 @@
   REAL,             INTENT(OUT) :: v(:,:,:)
   CALL err(NF90_INQ_VARID(fID,var,vID),"inq",var)
-  CALL err(NF90_GET_VAR(fID,vID,v),"get",var)
+  CALL err(nf90_get_var(fID,vID,v),"get",var)
 END SUBROUTINE get_var3
 
@@ -233 +233 @@
   CHARACTER(LEN=*), INTENT(IN) :: typ    !--- TYPE OF OPERATION
   CHARACTER(LEN=*), INTENT(IN) :: nam    !--- FIELD/FILE NAME
-  IF(ierr==NF90_NoERR) RETURN
+  IF(ierr==nf90_noerr) RETURN
   SELECT CASE(typ)
     CASE('inq');   mesg="Field <"//TRIM(nam)//"> is missing"