Changeset 5251 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Oct 22, 2024, 12:31:08 PM (5 weeks ago)

Author:

abarral

Message:

Wrap uses of cpp key INCA
Add INCA wrapper

File:

• LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (modified) (15 diffs)

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -109 +109 @@
 
 
-#ifdef INCA
     USE geometry_mod,      ONLY: longitude, latitude, boundslon, boundslat, ind_cell_glo
     USE time_phylmdz_mod,  ONLY: ndays
     USE infotrac_phy,      ONLY: nqCO2
-#endif
 #ifdef REPROBUS
     USE chem_rep, ONLY: Init_chem_rep_xjour, d_q_rep, d_ql_rep, d_qi_rep, &
@@ -120 +118 @@
     USE strataer_emiss_mod, ONLY: strataer_emiss_init
 #endif
-#if defined INCA || defined REPROBUS
     USE time_phylmdz_mod,    ONLY: annee_ref, day_ini, day_ref, start_time
     USE vertical_layers_mod, ONLY: aps, bps, ap, bp
-#endif
 
 
@@ -441 +437 @@
        reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra
        USE output_physiqex_mod, ONLY: output_physiqex
+       USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
 
 
@@ -1349 +1346 @@
     REAL, dimension(klon, klev) :: cldfrarad   ! fraction nuageuse
 
-#ifdef INCA
     REAL :: calday, zxsnow_dummy(klon)
     ! set de variables utilisees pour l'initialisation des valeurs provenant de INCA
@@ -1356 +1352 @@
     REAL, DIMENSION(klon,klev,naero_grp,nbands) :: init_cginca
     REAL, DIMENSION(klon,klev,nbands) :: init_ccminca
-#endif
     REAL, DIMENSION(klon,nbtr) :: init_source
 
@@ -2340 +2335 @@
        !
        IF (ANY(type_trac == ['inca','inco'])) THEN ! ModThL
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
           CALL VTe(VTphysiq)
           CALL VTb(VTinca)
@@ -2350 +2345 @@
           config_inca)
 
-          CALL init_inca_geometry( & 
+          CALL init_inca_geometry( &
                longitude, latitude, &
                boundslon, boundslat, &
-               cell_area, ind_cell_glo) 
-
-          if (grid_type==unstructured) THEN 
+               cell_area, ind_cell_glo)
+
+          if (grid_type==unstructured) THEN
              CALL chemini(  pplay, &
                   nbp_lon, nbp_lat, &
@@ -2413 +2408 @@
           piz_aero(:,:,:,:) = init_pizinca
           cg_aero(:,:,:,:) = init_cginca
-!          
+!
 
 
           CALL VTe(VTinca)
           CALL VTb(VTphysiq)
-#endif
+END IF
        ENDIF
        !
@@ -5635 +5630 @@
 
     IF (ANY(type_trac == ['inca','inco'])) THEN ! ModThL
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
        CALL VTe(VTphysiq)
        CALL VTb(VTinca)
@@ -5688 +5683 @@
        CALL VTe(VTinca)
        CALL VTb(VTphysiq)
-#endif
+END IF
     ENDIF !type_trac = inca or inco
     IF (type_trac == 'repr') THEN
@@ -5978 +5973 @@
 
        IF (aerosol_couple.AND.config_inca=='aero') THEN 
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
           CALL radlwsw_inca  &
                (chemistry_couple, kdlon,kflev,dist, rmu0, fract, solaire, &
@@ -5998 +5993 @@
                cldtaupirad, &
                topswai_aero, solswai_aero)
-#endif
+END IF
        ELSE
           !
@@ -7109 +7104 @@
     !
     IF (ANY(type_trac == ['inca','inco'])) THEN
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
        CALL VTe(VTphysiq)
        CALL VTb(VTinca)
@@ -7129 +7124 @@
        CALL VTe(VTinca)
        CALL VTb(VTphysiq)
-#endif
+END IF
     ENDIF
 
@@ -7440 +7435 @@
        IF (using_xios) THEN
 
-#ifdef INCA
-          IF (type_trac == 'inca') THEN 
-             IF (is_omp_master .AND. grid_type==unstructured) THEN 
+IF (CPPKEY_INCA) THEN
+          IF (type_trac == 'inca') THEN
+             IF (is_omp_master .AND. grid_type==unstructured) THEN
                 CALL finalize_inca
              ENDIF
           ENDIF
-#endif
+END IF
 
 ! close xios physiq context (call LMDZ)