Changeset 5091 for LMDZ6/branches/Amaury_dev/libf/dyn3d

Timestamp:

Jul 20, 2024, 11:17:09 PM (2 months ago)

Author:

abarral

Message:

Move lmdz_netcdf_format.F90 -> lmdz_cppkeys_wrapper.F90 to handle other CPP keys
Replace all (except wrapper) use of CPP_PHYS by fortran logical
Refactor makelmdz_fcm (put blocks into functions, use modern bash)

Location:

LMDZ6/branches/Amaury_dev/libf/dyn3d

Files:

• dynetat0.F90 (modified) (2 diffs)
• integrd.F (modified) (1 diff)
• leapfrog.F (modified) (10 diffs)

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

@@ -19 +19 @@
   USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
 
   IMPLICIT NONE
@@ -140 +141 @@
     ix = strIdx(newHNO3, var); IF(ix /= 0) oldVar = oldHNO3(ix)                          !--- REPROBUS HNO3 exceptions
 #endif
-#ifdef INCA
-    IF(var == 'O3') oldVar = 'OX'                                                        !--- DEAL WITH INCA OZONE EXCEPTION
-#endif
+    IF (CPPKEY_INCA) THEN
+      IF(var == 'O3') oldVar = 'OX'                                                        !--- DEAL WITH INCA OZONE EXCEPTION
+    END IF
     !--------------------------------------------------------------------------------------------------------------------------
     IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr .AND. .NOT.lSkip) THEN                !=== REGULAR CASE: AVAILABLE VARIABLE

LMDZ6/branches/Amaury_dev/libf/dyn3d/integrd.F

@@ -182 +182 @@
 c$$$      IF( iadv(1).NE.3.AND.iadv(2).NE.3 )    THEN
 c$$$c
-c$$$       IF( forward. OR . leapf )  THEN
+c$$$       IF( forward .OR.  leapf )  THEN
 c$$$        DO iq = 1,2
 c$$$        DO  l = 1,llm

LMDZ6/branches/Amaury_dev/libf/dyn3d/leapfrog.F

@@ -344 +344 @@
      &           'leapfrog 686: avant caladvtrac')
 
-      IF( forward. OR . leapf )  THEN
+      IF( forward .OR.  leapf )  THEN
 ! Ehouarn: NB: fields sent to advtrac are those at the beginning of the time step
          CALL caladvtrac(q,pbaru,pbarv,
@@ -363 +363 @@
          ENDIF ! of IF (offline)
 c
-      ENDIF ! of IF( forward. OR . leapf )
+      ENDIF ! of IF( forward .OR.  leapf )
 
 
@@ -390 +390 @@
           IF( itau==itaufin.AND..NOT.forward ) lafin = .TRUE.
        ELSE
-          IF( itau+1. EQ. itaufin )              lafin = .TRUE.
+          IF( itau+1 == itaufin )              lafin = .TRUE.
        ENDIF
 c
@@ -634 +634 @@
 c       ........................................................
 
-            IF(forward. OR. leapf) THEN
+            IF(forward .OR. leapf) THEN
               itau= itau + 1
 c              iday= day_ini+itau/day_step
@@ -645 +645 @@
 
 
-            IF( itau. EQ. itaufinp1 ) then  
+            IF( itau == itaufinp1 ) then
               if (flag_verif) then
                 write(79,*) 'ucov',ucov
@@ -746 +746 @@
             IF( MOD(itau,iperiod)==0 )    THEN
                     GO TO 1
-            ELSE IF ( MOD(itau-1,iperiod). EQ. 0 ) THEN
+            ELSE IF ( MOD(itau-1,iperiod) == 0 ) THEN
 
                    IF( forward )  THEN
@@ -791 +791 @@
 
                forward =  .FALSE.
-               IF( itau. EQ. itaufinp1 ) then  
+               IF( itau == itaufinp1 ) then
                  abort_message = 'Simulation finished'
                  call abort_gcm(modname,abort_message,0)
@@ -801 +801 @@
               call check_isotopes_seq(q,ip1jmp1,'leapfrog 1698')
 
-              IF(MOD(itau,iperiod).EQ.0 .OR. itau.EQ.itaufin) THEN
-               IF(itau.EQ.itaufin) THEN
+              IF(MOD(itau,iperiod)==0 .OR. itau==itaufin) THEN
+               IF(itau==itaufin) THEN
                   iav=1
                ELSE
@@ -826 +826 @@
               ENDIF ! of IF(MOD(itau,iperiod).EQ.0 .OR. itau.EQ.itaufin)
 
-              IF(MOD(itau,iecri         ).EQ.0) THEN
+              IF(MOD(itau,iecri         )==0) THEN
 c              IF(MOD(itau,iecri*day_step).EQ.0) THEN
                 CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
@@ -848 +848 @@
               ENDIF ! of IF(MOD(itau,iecri         ).EQ.0) 
 
-              IF(itau.EQ.itaufin) THEN
+              IF(itau==itaufin) THEN
 !                if (planet_type.eq."earth") then
                   CALL dynredem1("restart.nc",start_time,