Changeset 5250 for LMDZ6/trunk/libf/dyn3d

Timestamp:

Oct 22, 2024, 11:55:35 AM (5 weeks ago)

Author:

abarral

Message:

Wrap uses of cpp key CPP_PHYS

Location:

LMDZ6/trunk/libf/dyn3d

Files:

• gcm.F90 (modified) (3 diffs)
• leapfrog.F90 (modified) (2 diffs)
• replay3d.F90 (modified) (1 diff)

LMDZ6/trunk/libf/dyn3d/gcm.F90

@@ -25 +25 @@
   USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
   USE logic_mod, ONLY: ecripar, iflag_phys, read_start
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -30 +31 @@
   ! A nettoyer. On ne veut qu'une ou deux routines d'interface 
   ! dynamique -> physique pour l'initialisation
-#ifdef CPP_PHYS
   USE iniphysiq_mod, ONLY: iniphysiq
-#endif
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -406 +405 @@
 
   IF ((iflag_phys==1).or.(iflag_phys>=100)) THEN
-     ! Physics:
-#ifdef CPP_PHYS
-     CALL iniphysiq(iim,jjm,llm, &
-          (jjm-1)*iim+2,comm_lmdz, &
-          daysec,day_ini,dtphys/nsplit_phys, &
-          rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
-          iflag_phys)
-#endif
+    ! Physics:
+    IF (CPPKEY_PHYS) THEN
+      CALL iniphysiq(iim, jjm, llm, &
+              (jjm - 1) * iim + 2, comm_lmdz, &
+              daysec, day_ini, dtphys / nsplit_phys, &
+              rlatu, rlatv, rlonu, rlonv, aire, cu, cv, rad, g, r, cpp, &
+              iflag_phys)
+    END IF
   ENDIF ! of IF ((iflag_phys==1).or.(iflag_phys>=100))
 

LMDZ6/trunk/libf/dyn3d/leapfrog.F90

@@ -27 +27 @@
         start_time,dt
   USE strings_mod, ONLY: msg
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
 
   IMPLICIT NONE
@@ -462 +463 @@
 #endif
   ! #endif of #ifdef CPP_IOIPSL
-#ifdef CPP_PHYS
+IF (CPPKEY_PHYS) THEN
      CALL calfis( lafin , jD_cur, jH_cur, &
            ucov,vcov,teta,q,masse,ps,p,pk,phis,phi , &
            du,dv,dteta,dq, &
            flxw,dufi,dvfi,dtetafi,dqfi,dpfi  )
-#endif
+END IF
    ! ajout des tendances physiques:
    ! ------------------------------

LMDZ6/trunk/libf/dyn3d/replay3d.F90

@@ -28 +28 @@
   ! A nettoyer. On ne veut qu'une ou deux routines d'interface 
   ! dynamique -> physique pour l'initialisation
-#ifdef CPP_PHYS
   USE iniphysiq_mod, ONLY: iniphysiq
-#endif
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!