Changeset 5098 for LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

Timestamp:

Jul 22, 2024, 6:53:44 PM (4 months ago)

Author:

abarral

Message:

Remove CRAY key (obsolete calls to functions that don't exist anymore, bugs in some implementations, irrelevant now)
Replace usage of CPP_XIOS key by using_xios logical
Remove always unused testcpu bits
Replace most uses of CPP_StratAer by the corresponding logical defined in lmdz_cppkeys_wrapper.F90 [this breaks iso compilation because phyiso doesn't define all aerosols - to be fixed later]
Replaces uses of include "yomcst.h" by the lmdz_yomcst.f90 module in .[fF]90 files

File:

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

LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

@@ -95 +95 @@
     USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
 
+    USE geometry_mod,      ONLY: longitude, latitude, boundslon, boundslat, ind_cell_glo
+    USE time_phylmdz_mod,  ONLY: ndays
+    USE infotrac_phy,      ONLY: nqCO2
+
+    USE time_phylmdz_mod,    ONLY: annee_ref, day_ini, day_ref, start_time
+    USE vertical_layers_mod, ONLY: aps, bps, ap, bp
+
+    USE lmdz_xios, ONLY: xios_update_calendar, xios_context_finalize, xios_get_field_attr, &
+            xios_field_is_active, xios_context, xios_set_current_context
+    USE wxios, ONLY: missing_val, using_xios
+    USE paramLMDZ_phy_mod
+
 
     !USE cmp_seri_mod
@@ -111 +123 @@
 #endif
 
-
-    USE geometry_mod,      ONLY: longitude, latitude, boundslon, boundslat, ind_cell_glo
-    USE time_phylmdz_mod,  ONLY: ndays
-    USE infotrac_phy,      ONLY: nqCO2
 #ifdef REPROBUS
     USE chem_rep, ONLY: Init_chem_rep_xjour, d_q_rep, d_ql_rep, d_qi_rep, &
@@ -121 +129 @@
     USE strataer_emiss_mod, ONLY: strataer_emiss_init
 #endif
-    USE time_phylmdz_mod,    ONLY: annee_ref, day_ini, day_ref, start_time
-    USE vertical_layers_mod, ONLY: aps, bps, ap, bp
-
 
 #ifdef CPP_RRTM
@@ -131 +136 @@
 
 
-#ifdef CPP_StratAer
     USE phys_local_var_mod, ONLY: d_q_emiss
     USE strataer_local_var_mod
     USE strataer_nuc_mod, ONLY: strataer_nuc_init
     USE strataer_emiss_mod, ONLY: strataer_emiss_init
-#endif
-
-    USE lmdz_xios, ONLY: xios_update_calendar, xios_context_finalize
-    USE lmdz_xios, ONLY: xios_get_field_attr, xios_field_is_active, xios_context
-    USE lmdz_xios, ONLY: xios_set_current_context
-    USE wxios, ONLY: missing_val, using_xios
-
-#ifndef CPP_XIOS
-    USE paramLMDZ_phy_mod
-#endif
-
 
 #ifdef ISO
@@ -1510 +1503 @@
 #endif
 
-#ifdef CPP_StratAer
+IF (CPPKEY_STRATAER) THEN
        CALL strataer_init
        CALL strataer_nuc_init
        CALL strataer_emiss_init
-#endif
+END IF
 
        print*, '================================================='
@@ -1928 +1921 @@
        WRITE(lunout,*)'OK freq_outNMC(3)=',freq_outNMC(3)
 
-#ifndef CPP_XIOS
+    IF (.NOT. using_xios) THEN
        CALL ini_paramLMDZ_phy(phys_tstep,nid_ctesGCM)
-#endif
+END IF
 
 #endif
@@ -5800 +5793 @@
           ELSE
 #ifdef CPP_RRTM
-#ifndef CPP_StratAer
+IF (.NOT. CPPKEY_STRATAER) THEN
           !--prescribed strat aerosols 
           !--only in the case of non-interactive strat aerosols
@@ -5811 +5804 @@
              CALL abort_physic(modname,abort_message,1)
             ENDIF
-#endif
+END IF
 #else
              abort_message='You should compile with -rrtm if running ' &
@@ -5823 +5816 @@
 !
 #ifdef CPP_RRTM
-#ifdef CPP_StratAer
+IF (CPPKEY_STRATER) THEN
        !--compute stratospheric mask
        CALL stratosphere_mask(missing_val, pphis, t_seri, pplay, latitude_deg)
        !--interactive strat aerosols
        CALL calcaerosolstrato_rrtm(pplay,t_seri,paprs,debut)
-#endif
+END IF
 #endif
        !--fin STRAT AEROSOL
@@ -6470 +6463 @@
     IF (ok_qch4) THEN
 !      d_q_ch4: H2O source from CH4 in MMR/s (mass mixing ratio/s or kg H2O/kg air/s)
-#ifdef CPP_StratAer
+IF (CPPKEY_STRATER) THEN
        CALL stratH2O_methox(debut,paprs,d_q_ch4)
-#else
+ELSE
 !      ECMWF routine METHOX
        CALL METHOX(1,klon,klon,klev,q_seri,d_q_ch4,pplay)
-#endif
+END IF
        ! add humidity tendency due to methane
        d_q_ch4_dtime(:,:) = d_q_ch4(:,:)*phys_tstep
@@ -6494 +6487 @@
     !
     !
-#ifdef CPP_StratAer
+IF (CPPKEY_STRATER) THEN
     IF (ok_qemiss) THEN
        flh2o=1
@@ -6537 +6530 @@
        END SELECT ! emission scenario (flag_emit)
     ENDIF
-#endif
+END IF
 
 !===============================================================
@@ -6997 +6990 @@
     ENDDO
 
-#ifdef CPP_StratAer
+IF (CPPKEY_STRATER) THEN
     IF (ok_qemiss) THEN
        DO k = 1, klev
@@ -7003 +6996 @@
        ENDDO
     ENDIF
-#endif
+END IF
     IF (ok_qch4) THEN
        DO k = 1, klev
@@ -7334 +7327 @@
 #endif
 
-#ifndef CPP_XIOS
+    IF (.NOT. using_xios) THEN
       CALL write_paramLMDZ_phy(itap,nid_ctesGCM,ok_sync)
-#endif
+END IF
 
 #endif