Changeset 5181 for LMDZ6/trunk

Timestamp:

Sep 10, 2024, 3:06:08 PM (3 months ago)

Author:

abarral

Message:

Replace IOPHYS_WK CPP key by logical.
jyg & amaury

Location:

LMDZ6/trunk/libf/phylmd

Files:

• lmdz_wake.F90 (modified) (27 diffs)
• lmdz_wake_ini.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/lmdz_wake.F90

@@ -1 +1 @@
 MODULE lmdz_wake
 
-! $Id$
+  USE lmdz_wake_ini, ONLY: CPPKEY_IOPHYS_WK
+
+  IMPLICIT NONE; PRIVATE
+  PUBLIC wake
 
 CONTAINS
@@ -353 +356 @@
 !
 IF (first_call) THEN
-!!#define IOPHYS_WK
-#undef IOPHYS_WK
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
   IF (phys_sub) THEN
     call iophys_ini(dtimesub)
@@ -361 +362 @@
     call iophys_ini(dtime)
   ENDIF
-#endif
+END IF
   first_call = .false.
 ENDIF   !(first_call)
@@ -771 +772 @@
 
   END DO
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
   IF (.not.phys_sub) CALL iophys_ecrit('wape_a',1,'wape_a','J/kg',wape)
-#endif
+END IF
 
   ! 2.2 Prognostic variable update
@@ -1007 +1008 @@
 !!--------------------------------------------------------
     ELSEIF (iflag_wk_pop_dyn == 3) THEN
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
     IF (phys_sub) THEN
      CALL iophys_ecrit('ptop',1,'ptop','Pa',ptop)
@@ -1018 +1019 @@
      CALL iophys_ecrit('irad_wk',1,'irad_wk','m',irad_wk)
     ENDIF
-#endif
+END IF
   !
      CALL wake_popdyn_3 ( klon, klev, phys_sub, wk_adv, dtimesub, wgen, &
@@ -1072 +1073 @@
 !!--------------------------------------------------------
 
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
     IF (phys_sub) THEN
      CALL iophys_ecrit('wdensa',1,'wdensa','m',wdens)
@@ -1079 +1080 @@
      CALL iophys_ecrit('asigmawa',1,'asigmawa','m',asigmaw)
     ENDIF
-#endif
+END IF
     ! calcul de la difference de vitesse verticale poche - zone non perturbee
     ! IM 060208 differences par rapport au code initial; init. a 0 dp_deltomg
@@ -1669 +1670 @@
           END DO
 
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
     IF (phys_sub) THEN
      CALL iophys_ecrit('wdensb',1,'wdensb','m',wdens)
@@ -1702 +1703 @@
      CALL iophys_ecrit('d_asig_bnd2',1,'d_asig_bnd2','m',d_asig_bnd2)
     ENDIF
-#endif
+END IF
         ENDIF ! (iflag_wk_pop_dyn == 3)
       ENDIF ! (iflag_wk_pop_dyn >= 2)
@@ -1866 +1867 @@
   !
 
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
     IF (.not.phys_sub) CALL iophys_ecrit('wape_b',1,'wape_b','J/kg',wape)
-#endif
+END IF
   IF (prt_level>=10) THEN
     PRINT *, 'wake-5, sigmaw(igout), cstar(igout), wape(igout), ptop(igout) ', &
@@ -2009 +2010 @@
     END IF
   END DO
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
   IF (.not.phys_sub) CALL iophys_ecrit('wape2_a',1,'wape2_a','J/kg',wape2)
-#endif
+END IF
 
 
@@ -2041 +2042 @@
     END DO
   END IF
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
   IF (.not.phys_sub) CALL iophys_ecrit('wape2_b',1,'wape2_b','J/kg',wape2)
-#endif
+END IF
 
 
@@ -2087 +2088 @@
         gwake(i) = .TRUE.
       END IF
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
   IF (.not.phys_sub) CALL iophys_ecrit('cstar2',1,'cstar2','J/kg',cstar2)
-#endif
+END IF
     END IF  ! (ok_qx_qw(i))
   END DO
@@ -2123 +2124 @@
   END DO
     IF (iflag_wk_pop_dyn >= 3) THEN
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
       IF (.not.phys_sub) THEN
        CALL iophys_ecrit('fip',1,'fip','J/kg',fip)
@@ -2163 +2164 @@
        CALL iophys_ecrit('d_asig_bnd2',1,'d_asig_bnd2','m',d_asig_bnd2)
       ENDIF  ! (.not.phys_sub)
-#endif
+END IF
     ENDIF  ! (iflag_wk_pop_dyn >= 3)
   ! Limitation de sigmaw
@@ -2268 +2269 @@
                       wape(igout),wape2(igout),ktopw(igout),OK_qx_qw(igout)
   ENDIF
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
   IF (.not.phys_sub) CALL iophys_ecrit('wape_c',1,'wape_c','J/kg',wape)
-#endif
+END IF
 
 
@@ -3255 +3256 @@
           d_sig_spread(i) =  d_sig_spread(i)*dtimesub 
           d_sigmaw(i) =  d_sig_gen(i) + d_sig_death(i) + d_sig_col(i) + d_sig_spread(i)
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
           IF (phys_sub) call iophys_ecrit('d_sigmaw0',1,'d_sigmaw0','',d_sigmaw)
-#endif
+END IF
 
          
@@ -3266 +3267 @@
           d_sigmaw(i) = d_sigmaw_targ
 !!          d_sigmaw(i) = max(d_sigmaw(i), sigmad-sigmaw(i))
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
           IF (phys_sub) THEN
              call iophys_ecrit('tauwk_inv',1,'tau_wk_inv_min','',tau_wk_inv_min)
@@ -3276 +3277 @@
              call iophys_ecrit('d_sig_bnd',1,'d_sig_bnd','',d_sig_bnd)
           ENDIF
-#endif
+END IF
           d_asig_death(i) = - asigmaw(i)/tau_prime(i)
           d_asig_aicol(i) = (agfl(i)*iwdens(i) + igfl(i)*awdens(i))*cstar(i)*is_wk(i)
@@ -3287 +3288 @@
           d_asig_spread(i) =  d_asig_spread(i)*dtimesub 
           d_asigmaw(i) =  d_sig_gen(i) + d_asig_death(i) + d_asig_aicol(i) + d_asig_iicol(i) + d_asig_spread(i)
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
           IF (phys_sub) call iophys_ecrit('d_asigmaw0',1,'d_asigmaw0','',d_asigmaw)
-#endif
+END IF
 
           d_sigmaw_targ = min(max(d_asigmaw(i),-asigmaw(i)), sigmaw(i)-asigmaw(i))
@@ -3295 +3296 @@
           d_asig_bnd(i) = d_sigmaw_targ - d_asigmaw(i)
           d_asigmaw(i) = d_sigmaw_targ
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
           IF (phys_sub) THEN
              call iophys_ecrit('d_asigmaw',1,'d_asigmaw','',d_asigmaw)
@@ -3304 +3305 @@
              call iophys_ecrit('d_asig_bnd',1,'d_asig_bnd','',d_asig_bnd)
           ENDIF
-#endif
+END IF
           d_dens_gen(i) = wgen(i)
           d_dens_death(i) = - iwdens(i)*tau_wk_inv_min 
@@ -3318 +3319 @@
           d_dens_bnd(i) = d_wdens_targ - d_wdens(i)
           d_wdens(i) = d_wdens_targ
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
     IF (phys_sub) THEN 
         call iophys_ecrit('d_wdens',1,'d_wdens','',d_wdens)
@@ -3325 +3326 @@
         call iophys_ecrit('d_dens_col',1,'d_dens_col','',d_dens_col)
     ENDIF
-#endif
+END IF
 
           d_adens_death(i) = -awdens(i)/tau_prime(i)
@@ -3335 +3336 @@
           d_adens_acol(i)  =   d_adens_acol(i)*dtimesub
           d_awdens(i) =   d_dens_gen(i) + d_adens_death(i) + d_adens_icol(i) + d_adens_acol(i)     
-#ifdef IOPHYS_WK
+IF (CPPKEY_IOPHYS_WK) THEN
     IF (phys_sub) THEN 
         call iophys_ecrit('d_awdens',1,'d_awdens','',d_awdens)
@@ -3342 +3343 @@
         call iophys_ecrit('d_adens_acol',1,'d_adens_acol','',d_adens_acol)
     ENDIF
-#endif
+END IF
           d_wdens_targ = min(max(d_awdens(i),-awdens(i)), wdens(i)-awdens(i))
 !!          d_dens_bnd(i) = d_dens_bnd(i) + d_wdens_targ - d_wdens(i)

LMDZ6/trunk/libf/phylmd/lmdz_wake_ini.F90

@@ -81 +81 @@
   !$OMP THREADPRIVATE(wk_int_delta_t_min)
 
+! CPP key used only in this module for debugging purposes. jyg 09/24
+!!#define IOPHYS_WK
+#ifdef IOPHYS_WK
+  LOGICAL, PARAMETER :: CPPKEY_IOPHYS_WK = .TRUE.
+#else
+  LOGICAL, PARAMETER :: CPPKEY_IOPHYS_WK = .FALSE.
+#endif
+