Index: LMDZ6/trunk/libf/dyn3d/dynetat0.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/dynetat0.F90 (revision 5251) +++ LMDZ6/trunk/libf/dyn3d/dynetat0.F90 (revision 5252) @@ -25,5 +25,6 @@ #endif USE iso_params_mod ! tnat_* and alpha_ideal_* - USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS + USE strings_mod, ONLY: strIdx IMPLICIT NONE @@ -47,5 +48,5 @@ CHARACTER(LEN=maxlen) :: mesg, var, modname, oldVar INTEGER, PARAMETER :: length=100 - INTEGER :: iq, fID, vID, idecal, iqParent, iName, iZone, iPhase + INTEGER :: iq, fID, vID, idecal, iqParent, iName, iZone, iPhase, ix REAL :: time, tnat, alpha_ideal, tab_cntrl(length) !--- RUN PARAMS TABLE LOGICAL :: lSkip, ll, ltnat1 @@ -136,7 +137,7 @@ !--- Tracers ll=.FALSE. -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN ll = NF90_INQ_VARID(fID, 'HNO3tot', vID) /= NF90_NoErr !--- DETECT OLD REPRO start.nc FILE -#endif +END IF ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1) DO iq=1,nqtot @@ -144,7 +145,7 @@ oldVar = new2oldH2O(var) lSkip = ll .AND. var == 'HNO3' !--- FORCE "HNO3_g" READING FOR "HNO3" -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN ix = strIdx(newHNO3, var); IF(ix /= 0) oldVar = oldHNO3(ix) !--- REPROBUS HNO3 exceptions -#endif +END IF IF (CPPKEY_INCA) THEN IF(var == 'O3') oldVar = 'OX' !--- DEAL WITH INCA OZONE EXCEPTION Index: LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (revision 5251) +++ LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (revision 5252) @@ -118,8 +118,6 @@ SUBROUTINE init_infotrac USE control_mod, ONLY: planet_type -#ifdef REPROBUS - USE CHEM_REP, ONLY: Init_chem_rep_trac -#endif - USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA + USE lmdz_reprobus_wrappers, ONLY: Init_chem_rep_trac + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER IMPLICIT NONE !============================================================================================================================== @@ -202,11 +200,11 @@ END IF CASE('repr') -#ifndef REPROBUS +IF (.NOT. CPPKEY_REPROBUS) THEN CALL abort_gcm(modname, 'You must add cpp key REPROBUS and compile with REPROBUS code', 1) -#endif +END IF CASE('coag') -#ifndef CPP_StratAer +IF (.NOT. CPPKEY_STRATAER) THEN CALL abort_gcm(modname, 'You must add cpp key StratAer and compile with StratAer code', 1) -#endif +END IF END SELECT @@ -279,7 +277,7 @@ !--------------------------------------------------------------------------------------------------------------------------- -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN CALL Init_chem_rep_trac(nbtr, nqo, tracers(:)%name) -#endif +END IF !============================================================================================================================== Index: LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90 (revision 5251) +++ LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90 (revision 5252) @@ -26,5 +26,5 @@ #endif USE iso_params_mod ! tnat_* and alpha_ideal_* - USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS IMPLICIT NONE @@ -161,7 +161,7 @@ ALLOCATE(q_glo(ip1jmp1,llm)) ll = .FALSE. -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN ll = NF90_INQ_VARID(fID, 'HNO3tot', vID) /= NF90_NoErr !--- DETECT OLD REPRO start.nc FILE -#endif +END IF ltnat1 = .TRUE.; CALL getin('tnateq1', ltnat1) DO iq=1,nqtot @@ -169,7 +169,7 @@ oldVar = new2oldH2O(var) lSkip = ll .AND. var == 'HNO3' !--- FORCE "HNO3_g" READING FOR "HNO3" -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN ix = strIdx(newHNO3, var); IF(ix /= 0) oldVar = oldHNO3(ix) !--- REPROBUS HNO3 exceptions -#endif +END IF IF (CPPKEY_INCA) THEN IF(var == 'O3') oldVar = 'OX' !--- DEAL WITH INCA OZONE EXCEPTION Index: LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.F90 (revision 5251) +++ LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.F90 (revision 5252) @@ -46,5 +46,5 @@ xios_set_current_context, & using_xios - USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS IMPLICIT NONE @@ -1531,7 +1531,7 @@ ENDIF END IF -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN if (type_trac == 'repr') CALL finalize_reprobus -#endif +END IF !$OMP MASTER @@ -1588,7 +1588,7 @@ ENDIF END IF -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN if (type_trac == 'repr') CALL finalize_reprobus -#endif +END IF !$OMP MASTER @@ -1762,7 +1762,7 @@ END IF -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN if (type_trac == 'repr') CALL finalize_reprobus -#endif +END IF !$OMP MASTER @@ -1876,7 +1876,7 @@ END IF -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN if (type_trac == 'repr') CALL finalize_reprobus -#endif +END IF !$OMP MASTER Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (revision 5251) +++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (revision 5252) @@ -17,11 +17,7 @@ USE vertical_layers_mod, ONLY : init_vertical_layers USE infotrac, ONLY: nbtr, type_trac -#ifdef CPP_StratAer USE infotrac_phy, ONLY: nbtr_bin, nbtr_sulgas, id_OCS_strat, & id_SO2_strat, id_H2SO4_strat, id_BIN01_strat - -#endif -#ifdef REPROBUS - USE CHEM_REP, ONLY : Init_chem_rep_phys + USE lmdz_reprobus_wrappers, ONLY : Init_chem_rep_phys #ifdef CPP_PARA USE parallel_lmdz, ONLY : mpi_size, mpi_rank @@ -29,5 +25,4 @@ #endif USE mod_phys_lmdz_omp_data, ONLY: klon_omp -#endif USE control_mod, ONLY: dayref,anneeref,day_step,nday,offline, iphysiq USE inifis_mod, ONLY: inifis @@ -46,5 +41,5 @@ USE ioipsl_getin_p_mod, ONLY: getin_p USE slab_heat_transp_mod, ONLY: ini_slab_transp_geom - USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS IMPLICIT NONE @@ -140,10 +135,10 @@ ! Initializations for Reprobus IF (type_trac == 'repr') THEN -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN call Init_chem_rep_phys(klon_omp,nlayer) call init_reprobus_para( & nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, & distrib_phys,communicator) -#endif +END IF ENDIF !$OMP END PARALLEL @@ -151,9 +146,9 @@ IF (type_trac == 'repr') THEN -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN call init_reprobus_para( & nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, & distrib_phys,communicator) -#endif +END IF ENDIF Index: LMDZ6/trunk/libf/misc/TEMP_FOR_STRATAER_REMOVE_ONCE_WE_MAKE_MODULE_OUT_OF_YOMCST_DOT_H.F90 =================================================================== --- LMDZ6/trunk/libf/misc/TEMP_FOR_STRATAER_REMOVE_ONCE_WE_MAKE_MODULE_OUT_OF_YOMCST_DOT_H.F90 (revision 5252) +++ LMDZ6/trunk/libf/misc/TEMP_FOR_STRATAER_REMOVE_ONCE_WE_MAKE_MODULE_OUT_OF_YOMCST_DOT_H.F90 (revision 5252) @@ -0,0 +1,1 @@ +link ../phylmd/rrtm/yomcst.F90 Index: LMDZ6/trunk/libf/misc/TEMP_FOR_STRATAER_REMOVE_ONCE_WE_MAKE_MODULE_OUT_OF_YOMCST_DOT_H___PARKIND1.F90 =================================================================== --- LMDZ6/trunk/libf/misc/TEMP_FOR_STRATAER_REMOVE_ONCE_WE_MAKE_MODULE_OUT_OF_YOMCST_DOT_H___PARKIND1.F90 (revision 5252) +++ LMDZ6/trunk/libf/misc/TEMP_FOR_STRATAER_REMOVE_ONCE_WE_MAKE_MODULE_OUT_OF_YOMCST_DOT_H___PARKIND1.F90 (revision 5252) @@ -0,0 +1,1 @@ +link ../phylmd/rrtm/parkind1.F90 Index: LMDZ6/trunk/libf/misc/lmdz_reprobus_wrappers.F90 =================================================================== --- LMDZ6/trunk/libf/misc/lmdz_reprobus_wrappers.F90 (revision 5252) +++ LMDZ6/trunk/libf/misc/lmdz_reprobus_wrappers.F90 (revision 5252) @@ -0,0 +1,42 @@ +! reprobus SUBROUTINE wrappers + +MODULE lmdz_reprobus_wrappers + +#ifdef REPROBUS + USE CHEM_REP, ONLY: init_chem_rep_trac, itroprep +#else + + ! TODO ugly temp solution until we properly wrap the REPROBUS code + INCLUDE "dimensions.h" + INTEGER :: itroprep(iim), iter, ndimozon + REAL :: rsuntime(2), pdt_rep, daynum, solaireTIME, ptrop(iim), ttrop(iim), ztrop(iim), gravit, Z1, & + Z2, fac, B + REAL, DIMENSION(iim, jjm) :: pdel, d_q_rep, d_ql_rep, d_qi_rep, rch42d, rn2o2d, rcfc112d, rcfc122d + LOGICAL :: ok_suntime, ok_rtime2d + +CONTAINS + + SUBROUTINE lmdz_reprobus_wrapper_abort + STOP 'REPROBUS key undefined, must not enter in REPROBUS wrappers ==> aborting' + END SUBROUTINE lmdz_reprobus_wrapper_abort + + ! TODO replace ugly wrappers below with actual signatures from REPROBUS code + + SUBROUTINE init_chem_rep_trac(nbtr, nqo, name) + INTEGER :: nbtr, nqo + CHARACTER(len = 256) :: name(:) + CALL lmdz_reprobus_wrapper_abort + END SUBROUTINE init_chem_rep_trac + + SUBROUTINE init_chem_rep_phys(klon, klev) + INTEGER :: klon, klev + CALL lmdz_reprobus_wrapper_abort + END SUBROUTINE init_chem_rep_phys + + SUBROUTINE init_chem_rep_xjour(j) + REAL :: j + CALL lmdz_reprobus_wrapper_abort + END SUBROUTINE init_chem_rep_xjour + +#endif +END MODULE lmdz_reprobus_wrappers Index: LMDZ6/trunk/libf/phy_common/physics_distribution_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phy_common/physics_distribution_mod.F90 (revision 5251) +++ LMDZ6/trunk/libf/phy_common/physics_distribution_mod.F90 (revision 5252) @@ -14,8 +14,6 @@ USE dimphy, ONLY : Init_dimphy USE infotrac_phy, ONLY : type_trac -#ifdef REPROBUS - USE CHEM_REP, ONLY : Init_chem_rep_phys -#endif - USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA + USE lmdz_reprobus_wrappers, ONLY : Init_chem_rep_phys + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS IMPLICIT NONE @@ -38,8 +36,8 @@ END IF -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN ! Initialization of Reprobus IF (type_trac == 'repr') CALL Init_chem_rep_phys(klon_omp,nbp_lev) -#endif +END IF !$OMP END PARALLEL @@ -53,5 +51,5 @@ ! USE infotrac_phy, ONLY : type_trac !#ifdef REPROBUS -! USE CHEM_REP, ONLY : Init_chem_rep_phys +! USE lmdz_reprobus_wrappers, ONLY : Init_chem_rep_phys !#endif Index: LMDZ6/trunk/libf/phylmd/conf_phys_m.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/conf_phys_m.F90 (revision 5251) +++ LMDZ6/trunk/libf/phylmd/conf_phys_m.F90 (revision 5252) @@ -35,4 +35,5 @@ USE phys_state_var_mod, ONLY: phys_tstep USE infotrac_phy, ONLY: type_trac + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_STRATAER INCLUDE "conema3.h" @@ -2598,14 +2599,14 @@ ! CALL abort_physic('conf_phys','ok_suntime_rrtm=y and solaire is provided',1) ! ENDIF -#ifdef CPP_StratAer - IF (iflag_rrtm .NE. 1) THEN +IF (CPPKEY_STRATAER) THEN + IF (iflag_rrtm .NE. 1) THEN WRITE(lunout,*) ' ERROR iflag_rrtm<>1 but StratAer activated' CALL abort_physic('conf_phys','iflag_rrtm not valid for StratAer',1) ENDIF - IF (NSW .NE. 6) THEN + IF (NSW .NE. 6) THEN WRITE(lunout,*) ' ERROR NSW<>6 but StratAer activated' CALL abort_physic('conf_phys','NSW not valid for StratAer',1) ENDIF -#endif +END IF !--test on ocean surface albedo Index: LMDZ6/trunk/libf/phylmd/infotrac_phy.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/infotrac_phy.F90 (revision 5251) +++ LMDZ6/trunk/libf/phylmd/infotrac_phy.F90 (revision 5252) @@ -19,8 +19,6 @@ PUBLIC :: new2oldH2O !--- For backwards compatibility in phyetat0 PUBLIC :: addPhase, delPhase !--- Add/remove the phase from the name of a tracer -#if defined CPP_StratAer || defined REPROBUS PUBLIC :: nbtr_bin, nbtr_sulgas !--- Number of aerosols bins and sulfur gases for StratAer model PUBLIC :: id_OCS_strat, id_SO2_strat, id_H2SO4_strat, id_BIN01_strat, id_TEST_strat -#endif !=== FOR ISOTOPES: General @@ -123,5 +121,4 @@ !$OMP THREADPRIVATE(conv_flg, pbl_flg) -#if defined CPP_StratAer || defined REPROBUS !=== SPECIFIC TO STRATOSPHERIC AEROSOLS (CK/OB) INTEGER, SAVE :: nbtr_bin, nbtr_sulgas !--- number of aerosols bins and sulfur gases for StratAer model @@ -129,5 +126,4 @@ INTEGER, SAVE :: id_OCS_strat, id_SO2_strat, id_H2SO4_strat, id_BIN01_strat, id_TEST_strat !$OMP THREADPRIVATE(id_OCS_strat, id_SO2_strat, id_H2SO4_strat, id_BIN01_strat, id_TEST_strat) -#endif CONTAINS @@ -135,8 +131,6 @@ SUBROUTINE init_infotrac_phy USE ioipsl_getin_p_mod, ONLY: getin_p -#ifdef REPROBUS - USE CHEM_REP, ONLY: Init_chem_rep_trac -#endif - USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA + USE lmdz_reprobus_wrappers, ONLY: Init_chem_rep_trac + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER IMPLICIT NONE !============================================================================================================================== @@ -169,7 +163,5 @@ CHARACTER(LEN=8), ALLOCATABLE :: solsym_inca(:) !--- Tracers names for INCA INTEGER :: nqINCA -#ifdef CPP_StratAer CHARACTER(LEN=maxlen), ALLOCATABLE :: tnames(:) -#endif CHARACTER(LEN=2) :: suff(9) !--- Suffixes for schemes of order 3 or 4 (Prather) CHARACTER(LEN=3) :: descrq(30) !--- Advection scheme description tags @@ -227,11 +219,11 @@ END IF CASE('repr') -#ifndef REPROBUS +IF (.NOT. CPPKEY_REPROBUS) THEN CALL abort_physic(modname, 'You must add cpp key REPROBUS and compile with REPROBUS code', 1) -#endif +END IF CASE('coag') -#ifndef CPP_StratAer +IF (.NOT. CPPKEY_STRATAER) THEN CALL abort_physic(modname, 'You must add cpp key StratAer and compile with StratAer code', 1) -#endif +END IF END SELECT !############################################################################################################################## @@ -314,7 +306,7 @@ !--------------------------------------------------------------------------------------------------------------------------- -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN CALL Init_chem_rep_trac(nbtr, nqo, tracers(:)%name) !--- Transfert the number of tracers to Reprobus -#endif +END IF !############################################################################################################################## @@ -443,5 +435,5 @@ CALL msg('iso_iName = '//strStack(int2str(PACK(tracers(:)%iso_iName, MASK=tracers(:)%iso_iGroup==iH2O))), modname) #endif -#ifdef CPP_StratAer +IF (CPPKEY_STRATAER) THEN IF (type_trac == 'coag') THEN nbtr_bin = COUNT([(tracers(iq)%name(1:3)=='BIN', iq=1, nqtot)]) @@ -461,5 +453,5 @@ CALL msg('id_TEST_strat ='//TRIM(int2str(id_TEST_strat )), modname) END IF -#endif +END IF CALL msg('end', modname) Index: LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90 (revision 5251) +++ LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90 (revision 5252) @@ -3,4 +3,5 @@ ! MODULE phys_local_var_mod + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_STRATAER ! Variables locales pour effectuer les appels en serie !====================================================================== @@ -701,10 +702,4 @@ !$OMP THREADPRIVATE(dqsfreez) - - - - -#ifdef CPP_StratAer -! ! variables for stratospheric aerosol REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: d_q_emiss @@ -717,5 +712,5 @@ !$OMP THREADPRIVATE(DENSO4) REAL, ALLOCATABLE, SAVE, DIMENSION(:,:, :) :: DENSO4B -!$OMP THREADPRIVATE(DENSO4B) +!$OMP THREADPRIVATE(DENSO4B) REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: f_r_wet !$OMP THREADPRIVATE(f_r_wet) @@ -802,9 +797,4 @@ REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_sed_part !$OMP THREADPRIVATE(budg_sed_part) -#endif -#ifdef REPROBUS - REAL,SAVE,ALLOCATABLE :: d_q_emiss(:,:) -!$OMP THREADPRIVATE(d_q_emiss) -#endif CONTAINS @@ -821,7 +811,5 @@ USE phys_output_var_mod USE phys_state_var_mod -#ifdef CPP_StratAer USE infotrac_phy, ONLY : nbtr_bin -#endif IMPLICIT NONE @@ -1229,5 +1217,5 @@ ALLOCATE(dqsauto(klon,klev), dqsagg(klon,klev), dqsrim(klon,klev), dqsmelt(klon,klev), dqsfreez(klon,klev)) -#ifdef CPP_StratAer +IF (CPPKEY_STRATAER) THEN ALLOCATE (d_q_emiss(klon,klev)) ALLOCATE (R2SO4(klon,klev)) @@ -1278,5 +1266,5 @@ ALLOCATE (sulfmmr_mode(klon,klev,nbtr_bin)) ALLOCATE (nd_mode(klon,klev,nbtr_bin)) -#endif +END IF END SUBROUTINE phys_local_var_init @@ -1634,5 +1622,5 @@ DEALLOCATE(dqsauto, dqsagg, dqsrim, dqsmelt, dqsfreez) -#ifdef CPP_StratAer +IF (CPPKEY_STRATAER) THEN ! variables for strat. aerosol CK DEALLOCATE (d_q_emiss) @@ -1681,5 +1669,5 @@ DEALLOCATE (budg_h2so4_to_part) DEALLOCATE (budg_sed_part) -#endif +END IF END SUBROUTINE phys_local_var_end Index: LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90 (revision 5251) +++ LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90 (revision 5252) @@ -1438,5 +1438,4 @@ 'flx_co2_land_cor', 'correction of the CO2 flux from the land', 'kg CO2 m-2 s-1', (/ ('', i=1, 10) /)) -#ifdef CPP_StratAer !--extinction coefficient TYPE(ctrl_out), SAVE :: o_ext_strat_550 = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 1/), & @@ -1517,5 +1516,4 @@ TYPE(ctrl_out), SAVE :: o_surf_PM25_sulf = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 1/), & 'surf_PM25_sulf', 'Sulfate PM2.5 concentration at the surface', 'ug/m3', (/ ('', i=1, 10) /)) -#endif !!!!!!!!!!!!!!!!!!!!!! 3D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Index: LMDZ6/trunk/libf/phylmd/phys_output_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/phys_output_mod.F90 (revision 5251) +++ LMDZ6/trunk/libf/phylmd/phys_output_mod.F90 (revision 5252) @@ -49,7 +49,5 @@ ! ug Pour les sorties XIOS USE wxios -#ifdef CPP_StratAer USE infotrac_phy, ONLY: nbtr_bin -#endif #ifdef ISO USE isotopes_mod, ONLY: isoName,iso_HTO @@ -58,4 +56,6 @@ #endif #endif + + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_STRATAER IMPLICIT NONE @@ -171,7 +171,7 @@ ALLOCATE(o_dtr_sscav(nqtot),o_dtr_sat(nqtot),o_dtr_uscav(nqtot)) ALLOCATE(o_dtr_dry(nqtot),o_dtr_vdf(nqtot)) -#ifdef CPP_StratAer +IF (CPPKEY_STRATAER) THEN ALLOCATE(o_nd_mode(nbtr_bin),o_sulfmmr_mode(nbtr_bin)) -#endif +END IF #ifdef ISO ALLOCATE(o_xtprecip(ntraciso)) @@ -233,9 +233,9 @@ clef_files(8) = ok_histNMC(2) clef_files(9) = ok_histNMC(3) -#ifdef CPP_StratAer - clef_files(10)= .TRUE. -#else - clef_files(10)= .FALSE. -#endif + IF (CPPKEY_STRATAER) THEN + clef_files(10)= .TRUE. + ELSE + clef_files(10)= .FALSE. + END IF !sortir des fichiers "stations" si clef_stations(:)=.TRUE. @@ -545,5 +545,5 @@ tnam = 'cum'//TRIM(tracers(iq)%name); o_trac_cum(itr) = ctrl_out(flag, tnam, lnam, "-", [('',i=1,nfiles)]) -#ifdef CPP_StratAer +IF (CPPKEY_STRATAER) THEN if(tracers(iq)%name(1:3)=='BIN') then itrb = itrb + 1 @@ -554,5 +554,5 @@ tnam = TRIM(tracers(iq)%name)//'_sulfmmr_mode';o_sulfmmr_mode (itrb) = ctrl_out(flag, tnam, lnam, "kg(H2SO4)/kg(air)", [('',i=1,nfiles)]) endif -#endif +END IF ENDDO Index: LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 (revision 5251) +++ LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 (revision 5252) @@ -249,20 +249,18 @@ #endif -#ifdef CPP_StratAer USE infotrac_phy, ONLY: nbtr_bin - USE phys_output_ctrlout_mod, ONLY: & + USE phys_output_ctrlout_mod, ONLY: & o_budg_3D_nucl, o_budg_3D_cond_evap, o_budg_3D_ocs_to_so2, o_budg_3D_so2_to_h2so4, & o_budg_sed_part, o_R2SO4, o_OCS_lifetime, o_SO2_lifetime, & - o_budg_3D_backgr_ocs, o_budg_3D_backgr_so2, & + o_budg_3D_backgr_ocs, o_budg_3D_backgr_so2, & o_budg_dep_dry_ocs, o_budg_dep_wet_ocs, & o_budg_dep_dry_so2, o_budg_dep_wet_so2, & o_budg_dep_dry_h2so4, o_budg_dep_wet_h2so4, & - o_budg_dep_dry_part, o_budg_dep_wet_part, & - o_budg_emi_ocs, o_budg_emi_so2, o_budg_emi_h2so4, o_budg_emi_part, & + o_budg_dep_dry_part, o_budg_dep_wet_part, & + o_budg_emi_ocs, o_budg_emi_so2, o_budg_emi_h2so4, o_budg_emi_part, & o_budg_ocs_to_so2, o_budg_so2_to_h2so4, o_budg_h2so4_to_part, & o_surf_PM25_sulf, o_ext_strat_550, o_tau_strat_550, & o_vsed_aer, o_tau_strat_1020, o_ext_strat_1020, o_f_r_wet, & o_SAD_sulfate, o_reff_sulfate, o_sulfmmr, o_nd_mode, o_sulfmmr_mode -#endif USE lmdz_lscp_ini, ONLY: ok_poprecip @@ -411,5 +409,4 @@ reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra -#ifdef CPP_StratAer USE phys_local_var_mod, ONLY: & budg_3D_nucl, budg_3D_cond_evap, budg_3D_ocs_to_so2, budg_3D_so2_to_h2so4, & @@ -425,5 +422,4 @@ vsed_aer, tau_strat_1020, f_r_wet, & SAD_sulfate, reff_sulfate, sulfmmr, nd_mode, sulfmmr_mode -#endif USE carbon_cycle_mod, ONLY: fco2_ff, fco2_bb, fco2_land, fco2_ocean @@ -478,4 +474,5 @@ USE vertical_layers_mod, ONLY: presnivs + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_STRATAER IMPLICIT NONE @@ -534,8 +531,6 @@ REAL, DIMENSION(klon,klev) :: coefh_stok -#ifdef CPP_StratAer LOGICAL, PARAMETER :: debug_strataer=.FALSE. CHARACTER(LEN=maxlen) :: unt -#endif #ifdef ISO @@ -1831,5 +1826,5 @@ ! end add ThL -#ifdef CPP_StratAer +IF (CPPKEY_STRATAER) THEN IF (type_trac=='coag') THEN CALL histwrite_phy(o_R2SO4, R2SO4) @@ -1874,5 +1869,5 @@ ENDDO !--itr ENDIF -#endif +END IF !NL IF (ok_volcan .AND. ok_ade) THEN Index: LMDZ6/trunk/libf/phylmd/physiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 5251) +++ LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 5252) @@ -112,13 +112,11 @@ 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, & + USE lmdz_reprobus_wrappers, ONLY: Init_chem_rep_xjour, d_q_rep, d_ql_rep, d_qi_rep, & ptrop, ttrop, ztrop, gravit, itroprep, Z1, Z2, fac, B USE strataer_local_var_mod 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 - USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER #ifdef CPP_RRTM @@ -127,11 +125,8 @@ #endif - -#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 @@ -1882,14 +1877,14 @@ ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN CALL strataer_init CALL strataer_emiss_init -#endif - -#ifdef CPP_StratAer +END IF + +IF (CPPKEY_STRATAER) THEN CALL strataer_init CALL strataer_nuc_init CALL strataer_emiss_init -#endif +END IF #ifdef CPP_Dust @@ -2254,5 +2249,5 @@ ! IF (type_trac == 'repr') THEN -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN CALL chemini_rep( & presnivs, & @@ -2265,5 +2260,5 @@ io_lon, & io_lat) -#endif +END IF ENDIF @@ -2369,9 +2364,9 @@ ! Update time and other variables in Reprobus IF (type_trac == 'repr') THEN -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN CALL Init_chem_rep_xjour(jD_cur-jD_ref+day_ref) print*,'xjour equivalent rjourvrai',jD_cur-jD_ref+day_ref CALL Rtime(debut) -#endif +END IF ENDIF @@ -2625,5 +2620,5 @@ wo(:,:,1)=ozonecm(latitude_deg, paprs,read_climoz,rjour=zzz) -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN ptrop=dyn_tropopause(t_seri, ztsol, paprs, pplay, rot)/100. DO i = 1, klon @@ -2633,5 +2628,5 @@ B=Z2-fac*alog(pplay(i,itroprep(i))) ttrop(i)= fac*alog(ptrop(i))+B -! +! Z1= 1.e-3 * ( pphi(i,itroprep(i)+1)+pphis(i) ) / gravit Z2= 1.e-3 * ( pphi(i,itroprep(i)) +pphis(i) ) / gravit @@ -2640,5 +2635,5 @@ ztrop(i)=fac*alog(ptrop(i))+B ENDDO -#endif +END IF ELSE !--- ro3i = elapsed days number since current year 1st january, 0h @@ -4231,8 +4226,8 @@ ENDIF !type_trac = inca or inco IF (type_trac == 'repr') THEN -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN !CALL chemtime_rep(itap+itau_phy-1, date0, dtime, itap) - CALL chemtime_rep(itap+itau_phy-1, date0, phys_tstep, itap) -#endif + CALL chemtime_rep(itap+itau_phy-1, date0, phys_tstep, itap) +END IF ENDIF @@ -4370,6 +4365,6 @@ ELSE #ifdef CPP_RRTM -#ifndef CPP_StratAer - !--prescribed strat aerosols +IF (.NOT. CPPKEY_STRATAER) THEN + !--prescribed strat aerosols !--only in the case of non-interactive strat aerosols IF (flag_aerosol_strat.EQ.1) THEN @@ -4381,5 +4376,5 @@ CALL abort_physic(modname,abort_message,1) ENDIF -#endif +END IF #else abort_message='You should compile with -rrtm if running ' & @@ -4393,10 +4388,10 @@ ! #ifdef CPP_RRTM -#ifdef CPP_StratAer +IF (CPPKEY_STRATAER) 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 @@ -5011,10 +5006,11 @@ 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_STRATAER) 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 @@ -5025,5 +5021,5 @@ ! ! -#ifdef CPP_StratAer +IF (CPPKEY_STRATAER) THEN IF (ok_qemiss) THEN flh2o=1 @@ -5033,5 +5029,5 @@ print *,'IN physiq_mod: nAerErupt=',nAerErupt ENDIF - + SELECT CASE(flag_emit) CASE(1) ! emission volc H2O in LMDZ @@ -5041,5 +5037,5 @@ day_cur>=day_emit_vol(ieru).AND.& day_cur<(day_emit_vol(ieru)+injdur)) THEN - + IF(flag_verbose_strataer) print *,'IN physiq_mod: date=',year_cur,mth_cur,day_cur ! initialisation of q tendency emission @@ -5056,8 +5052,8 @@ altemiss_vol(ieru),sigma_alt_vol(ieru),1,1.,& nAerErupt+1,0) - + IF(flag_verbose_strataer) print *,'IN physiq_mod: min max d_q_emiss=',& minval(d_q_emiss),maxval(d_q_emiss) - + CALL add_phys_tend(du0, dv0, dt0, d_q_emiss, dql0, dqi0, dqbs0, paprs, & 'q_emiss',abortphy,flag_inhib_tend,itap,0) @@ -5068,5 +5064,5 @@ END SELECT ! emission scenario (flag_emit) ENDIF -#endif +END IF !=============================================================== @@ -5305,9 +5301,9 @@ !MM dans Reprobus sh_in(:,:) = q_seri(:,:) -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN d_q_rep(:,:) = 0. d_ql_rep(:,:) = 0. d_qi_rep(:,:) = 0. -#endif +END IF ELSE sh_in(:,:) = qx(:,:,ivap) @@ -5362,5 +5358,5 @@ d_tr_dyn, & !<dyn_tropopause(i)) EXIT; END DO; kp=kt END IF -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN itroprep(i)=MAX(kt,kp) -#endif +END IF !--- LAST TROPOSPHERIC LAYER INDEX NEEDED IF(PRESENT(itrop)) itrop(i)=MAX(kt,kp) Index: LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 5251) +++ LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 5252) @@ -112,10 +112,8 @@ 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, & + USE lmdz_reprobus_wrappers, ONLY: Init_chem_rep_xjour, d_q_rep, d_ql_rep, d_qi_rep, & ptrop, ttrop, ztrop, gravit, itroprep, Z1, Z2, fac, B USE strataer_local_var_mod 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 @@ -128,10 +126,8 @@ -#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 @@ -437,5 +433,5 @@ reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra USE output_physiqex_mod, ONLY: output_physiqex - USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER @@ -1515,14 +1511,15 @@ CALL regr_horiz_time_climoz(read_climoz,ok_daily_climoz) -#ifdef REPROBUS - CALL strataer_init - CALL strataer_emiss_init -#endif - -#ifdef CPP_StratAer - CALL strataer_init - CALL strataer_nuc_init - CALL strataer_emiss_init -#endif + IF (CPPKEY_STRATAER .OR. CPPKEY_REPROBUS) THEN +#ifdef ISO +CALL abort_gcm("physiq_mod", "StratAer isn't ISO-compatible for now, 07/24",1) +#else + CALL strataer_init + CALL strataer_emiss_init + IF (CPPKEY_STRATAER) THEN + CALL strataer_nuc_init + END IF +#endif + END IF print*, '=================================================' @@ -2417,5 +2414,5 @@ ! IF (type_trac == 'repr') THEN -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN CALL chemini_rep( & presnivs, & @@ -2428,5 +2425,5 @@ io_lon, & io_lat) -#endif +END IF ENDIF @@ -2536,9 +2533,9 @@ ! Update time and other variables in Reprobus IF (type_trac == 'repr') THEN -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN CALL Init_chem_rep_xjour(jD_cur-jD_ref+day_ref) print*,'xjour equivalent rjourvrai',jD_cur-jD_ref+day_ref CALL Rtime(debut) -#endif +END IF ENDIF @@ -2985,5 +2982,5 @@ wo(:,:,1)=ozonecm(latitude_deg, paprs,read_climoz,rjour=zzz) -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN ptrop=dyn_tropopause(t_seri, ztsol, paprs, pplay, rot)/100. DO i = 1, klon @@ -2993,5 +2990,5 @@ B=Z2-fac*alog(pplay(i,itroprep(i))) ttrop(i)= fac*alog(ptrop(i))+B -! +! Z1= 1.e-3 * ( pphi(i,itroprep(i)+1)+pphis(i) ) / gravit Z2= 1.e-3 * ( pphi(i,itroprep(i)) +pphis(i) ) / gravit @@ -3000,5 +2997,5 @@ ztrop(i)=fac*alog(ptrop(i))+B ENDDO -#endif +END IF ELSE !--- ro3i = elapsed days number since current year 1st january, 0h @@ -5686,8 +5683,8 @@ ENDIF !type_trac = inca or inco IF (type_trac == 'repr') THEN -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN !CALL chemtime_rep(itap+itau_phy-1, date0, dtime, itap) - CALL chemtime_rep(itap+itau_phy-1, date0, phys_tstep, itap) -#endif + CALL chemtime_rep(itap+itau_phy-1, date0, phys_tstep, itap) +END IF ENDIF @@ -5824,6 +5821,6 @@ ELSE #ifdef CPP_RRTM -#ifndef CPP_StratAer - !--prescribed strat aerosols +IF (.NOT. CPPKEY_STRATAER) THEN + !--prescribed strat aerosols !--only in the case of non-interactive strat aerosols IF (flag_aerosol_strat.EQ.1) THEN @@ -5835,5 +5832,5 @@ CALL abort_physic(modname,abort_message,1) ENDIF -#endif +END IF #else abort_message='You should compile with -rrtm if running ' & @@ -5847,5 +5844,8 @@ ! #ifdef CPP_RRTM -#ifdef CPP_StratAer +IF (CPPKEY_STRATAER) THEN +#ifdef ISO +CALL abort_gcm("physiq_mod", "StratAer isn't ISO-compatible for now, 07/24",1) +#else !--compute stratospheric mask CALL stratosphere_mask(missing_val, pphis, t_seri, pplay, latitude_deg) @@ -5853,4 +5853,5 @@ CALL calcaerosolstrato_rrtm(pplay,t_seri,paprs,debut) #endif +END IF #endif !--fin STRAT AEROSOL @@ -6494,10 +6495,14 @@ 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_STRATAER) THEN +#ifdef ISO +CALL abort_gcm("physiq_mod", "StratAer isn't ISO-compatible for now, 07/24",1) +#else CALL stratH2O_methox(debut,paprs,d_q_ch4) -#else +#endif + 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 @@ -6518,5 +6523,8 @@ ! ! -#ifdef CPP_StratAer +IF (CPPKEY_STRATAER) THEN +#ifdef ISO +CALL abort_gcm("physiq_mod", "StratAer isn't ISO-compatible for now, 07/24",1) +#else IF (ok_qemiss) THEN flh2o=1 @@ -6526,5 +6534,5 @@ print *,'IN physiq_mod: nAerErupt=',nAerErupt ENDIF - + SELECT CASE(flag_emit) CASE(1) ! emission volc H2O in LMDZ @@ -6534,5 +6542,5 @@ day_cur>=day_emit_vol(ieru).AND.& day_cur<(day_emit_vol(ieru)+injdur)) THEN - + IF(flag_verbose_strataer) print *,'IN physiq_mod: date=',year_cur,mth_cur,day_cur ! initialisation of q tendency emission @@ -6549,8 +6557,8 @@ altemiss_vol(ieru),sigma_alt_vol(ieru),1,1.,& nAerErupt+1,0) - + IF(flag_verbose_strataer) print *,'IN physiq_mod: min max d_q_emiss=',& minval(d_q_emiss),maxval(d_q_emiss) - + CALL add_phys_tend(du0, dv0, dt0, d_q_emiss, dql0, dqi0, dqbs0, paprs, & 'q_emiss',abortphy,flag_inhib_tend,itap,0) @@ -6562,4 +6570,5 @@ ENDIF #endif +END IF !=============================================================== @@ -6879,9 +6888,9 @@ !MM dans Reprobus sh_in(:,:) = q_seri(:,:) -#ifdef REPROBUS +IF (CPPKEY_REPROBUS) THEN d_q_rep(:,:) = 0. d_ql_rep(:,:) = 0. d_qi_rep(:,:) = 0. -#endif +END IF ELSE sh_in(:,:) = qx(:,:,ivap) @@ -6936,6 +6945,8 @@ d_tr_dyn, & !<