Index: /LMDZ6/trunk/libf/phylmd/conf_phys_m.f90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/conf_phys_m.f90 (revision 6199) +++ /LMDZ6/trunk/libf/phylmd/conf_phys_m.f90 (revision 6200) @@ -6,69 +6,69 @@ MODULE conf_phys_m - USE clesphys_mod_h - IMPLICIT NONE - -! Récupéré de physiq_mod mars 2026. Faire le tri de ce qui doit être réintégré dans -! des modules spécifiques - LOGICAL, SAVE, PROTECTED :: ok_journe, ok_mensuel, ok_instan, ok_hf, ok_LES -!$OMP THREADPRIVATE(ok_journe, ok_mensuel, ok_instan, ok_hf, ok_LES) - LOGICAL, SAVE, PROTECTED :: ok_volcan ! pour activer les diagnostics volcaniques - !$OMP THREADPRIVATE(ok_volcan) - INTEGER, SAVE, PROTECTED :: flag_volc_surfstrat ! pour imposer le cool/heat rate à la surf/strato - !$OMP THREADPRIVATE(flag_volc_surfstrat) - INTEGER, SAVE, PROTECTED :: iflag_radia ! active ou non le rayonnement (MPL) - !$OMP THREADPRIVATE(iflag_radia) - REAL, SAVE, PROTECTED :: facttemps, fact_cldcon - !$OMP THREADPRIVATE(facttemps,fact_cldcon) - INTEGER, SAVE, PROTECTED :: iflag_cld_th - !$OMP THREADPRIVATE(iflag_cld_th) - LOGICAL ok_ade, ok_aie ! Apply aerosol (in)direct effects or not - LOGICAL ok_alw ! Apply aerosol LW effect or not - LOGICAL ok_cdnc ! ok cloud droplet number concentration (O. Boucher 01-2013) - REAL bl95_b0, bl95_b1 ! Parameter in Boucher and Lohmann (1995) - SAVE ok_ade, ok_aie, ok_alw, ok_cdnc, bl95_b0, bl95_b1 - !$OMP THREADPRIVATE(ok_ade, ok_aie, ok_alw, ok_cdnc, bl95_b0, bl95_b1) - LOGICAL, SAVE :: aerosol_couple ! true : calcul des aerosols dans INCA - ! false : lecture des aerosol dans un fichier - !$OMP THREADPRIVATE(aerosol_couple) - LOGICAL, SAVE :: chemistry_couple ! true : use INCA chemistry O3 - ! false : use offline chemistry O3 - !$OMP THREADPRIVATE(chemistry_couple) - INTEGER, SAVE :: flag_aerosol - !$OMP THREADPRIVATE(flag_aerosol) - LOGICAL, SAVE :: flag_bc_internal_mixture - !$OMP THREADPRIVATE(flag_bc_internal_mixture) - ! - !--STRAT AEROSOL - INTEGER, SAVE :: flag_aerosol_strat - !$OMP THREADPRIVATE(flag_aerosol_strat) - ! - !--INTERACTIVE AEROSOL FEEDBACK ON RADIATION - LOGICAL, SAVE :: flag_aer_feedback - !$OMP THREADPRIVATE(flag_aer_feedback) - - REAL,SAVE :: solarlong0 - !$OMP THREADPRIVATE(solarlong0) - - REAL, SAVE :: alp_offset - !$OMP THREADPRIVATE(alp_offset) - - INTEGER, SAVE, protected:: read_climoz = 0 ! read ozone climatology - ! Allowed values are 0, 1 and 2 - ! 0: do not read an ozone climatology - ! 1: read a single ozone climatology that will be used day and night - ! 2: read two ozone climatologies, the average day and night - ! climatology and the daylight climatology - !$OMP THREADPRIVATE(read_climoz) - - LOGICAL, SAVE, protected:: ok_daily_climoz - ! TRUE => daily interpolation - ! FALSE => no interpolation (14 months) - ! calendar dependent number of days - !$OMP THREADPRIVATE(ok_daily_climoz) - - LOGICAL, SAVE, protected:: adjust_tropopause - ! tropopause adjustement required - !$OMP THREADPRIVATE(adjust_tropopause) + USE clesphys_mod_h + IMPLICIT NONE + + ! Récupéré de physiq_mod mars 2026. Faire le tri de ce qui doit être réintégré dans + ! des modules spécifiques + LOGICAL, SAVE, PROTECTED :: ok_journe, ok_mensuel, ok_instan, ok_hf, ok_LES + !$OMP THREADPRIVATE(ok_journe, ok_mensuel, ok_instan, ok_hf, ok_LES) + LOGICAL, SAVE, PROTECTED :: ok_volcan ! pour activer les diagnostics volcaniques + !$OMP THREADPRIVATE(ok_volcan) + INTEGER, SAVE, PROTECTED :: flag_volc_surfstrat ! pour imposer le cool/heat rate à la surf/strato + !$OMP THREADPRIVATE(flag_volc_surfstrat) + INTEGER, SAVE, PROTECTED :: iflag_radia ! active ou non le rayonnement (MPL) + !$OMP THREADPRIVATE(iflag_radia) + REAL, SAVE, PROTECTED :: facttemps, fact_cldcon + !$OMP THREADPRIVATE(facttemps,fact_cldcon) + INTEGER, SAVE, PROTECTED :: iflag_cld_th + !$OMP THREADPRIVATE(iflag_cld_th) + LOGICAL ok_ade, ok_aie ! Apply aerosol (in)direct effects or not + LOGICAL ok_alw ! Apply aerosol LW effect or not + LOGICAL ok_cdnc ! ok cloud droplet number concentration (O. Boucher 01-2013) + REAL bl95_b0, bl95_b1 ! Parameter in Boucher and Lohmann (1995) + SAVE ok_ade, ok_aie, ok_alw, ok_cdnc, bl95_b0, bl95_b1 + !$OMP THREADPRIVATE(ok_ade, ok_aie, ok_alw, ok_cdnc, bl95_b0, bl95_b1) + LOGICAL, SAVE :: aerosol_couple ! true : calcul des aerosols dans INCA + ! false : lecture des aerosol dans un fichier + !$OMP THREADPRIVATE(aerosol_couple) + LOGICAL, SAVE :: chemistry_couple ! true : use INCA chemistry O3 + ! false : use offline chemistry O3 + !$OMP THREADPRIVATE(chemistry_couple) + INTEGER, SAVE :: flag_aerosol + !$OMP THREADPRIVATE(flag_aerosol) + LOGICAL, SAVE :: flag_bc_internal_mixture + !$OMP THREADPRIVATE(flag_bc_internal_mixture) + ! + !--STRAT AEROSOL + INTEGER, SAVE :: flag_aerosol_strat + !$OMP THREADPRIVATE(flag_aerosol_strat) + ! + !--INTERACTIVE AEROSOL FEEDBACK ON RADIATION + LOGICAL, SAVE :: flag_aer_feedback + !$OMP THREADPRIVATE(flag_aer_feedback) + + REAL,SAVE :: solarlong0 + !$OMP THREADPRIVATE(solarlong0) + + REAL, SAVE :: alp_offset + !$OMP THREADPRIVATE(alp_offset) + + INTEGER, SAVE, protected:: read_climoz = 0 ! read ozone climatology + ! Allowed values are 0, 1 and 2 + ! 0: do not read an ozone climatology + ! 1: read a single ozone climatology that will be used day and night + ! 2: read two ozone climatologies, the average day and night + ! climatology and the daylight climatology + !$OMP THREADPRIVATE(read_climoz) + + LOGICAL, SAVE, protected:: ok_daily_climoz + ! TRUE => daily interpolation + ! FALSE => no interpolation (14 months) + ! calendar dependent number of days + !$OMP THREADPRIVATE(ok_daily_climoz) + + LOGICAL, SAVE, protected:: adjust_tropopause + ! tropopause adjustement required + !$OMP THREADPRIVATE(adjust_tropopause) CONTAINS @@ -76,6 +76,6 @@ SUBROUTINE conf_phys - USE compbl_mod_h - USE ioipsl_getin_p_mod, ONLY : getin_p + USE compbl_mod_h + USE ioipsl_getin_p_mod, ONLY : getin_p USE alpale_mod USE yomcst_mod_h @@ -84,8 +84,8 @@ USE phys_cal_mod USE carbon_cycle_mod, ONLY: carbon_cycle_tr, carbon_cycle_cpl, carbon_cycle_rad, level_coupling_esm -! << PC + ! << PC USE carbon_cycle_mod, ONLY: read_daily_co2ff USE carbon_cycle_mod, ONLY: carbon_cycle_conc_driven -! >> PC + ! >> PC USE carbon_cycle_mod, ONLY: read_fco2_ocean_cor,var_fco2_ocean_cor USE carbon_cycle_mod, ONLY: read_fco2_land_cor,var_fco2_land_cor @@ -100,5 +100,5 @@ USE comsoil_mod_h USE ch4n2o_correction_mod, ONLY: ok_CH4_eff_ppb, ok_N2O_eff_ppb - + ! @@ -137,6 +137,6 @@ !----------------------------------------------------------------- -CHARACTER (len = 6) :: ocean -REAL co2_ppm_per + CHARACTER (len = 6) :: ocean + REAL co2_ppm_per print*,'CONFPHYS ENTREE' ! @@ -270,5 +270,5 @@ !================================================================== - + ! journalieres ! @@ -659,7 +659,7 @@ ok_suntime_rrtm = .FALSE. IF (iflag_rrtm==1) THEN - CALL getin_p('ok_suntime_rrtm',ok_suntime_rrtm) - ENDIF - + CALL getin_p('ok_suntime_rrtm',ok_suntime_rrtm) + ENDIF + ! - 0 = no stratospheric aerosols ! - 1 = stratospheric aerosols scaled from 550 nm AOD @@ -830,13 +830,13 @@ CALL getin_p('iflag_physiq',iflag_physiq) -!FC + !FC ! ifl_pbltree = 0 CALL getin_p('ifl_pbltree',ifl_pbltree) -!FC + !FC ! Cd_frein = 7.5E-02 CALL getin_p('Cd_frein',Cd_frein) -!AM + !AM ! iflag_hetero_surf = 0 @@ -1090,5 +1090,5 @@ - ! PARAMETERS FOR SNOW AND ICE MELTING + ! PARAMETERS FOR SNOW AND ICE MELTING chasno_tun=0.15 CALL getin_p('chasno_tun',chasno_tun) @@ -1126,5 +1126,5 @@ ! .TRUE. if backward compatibility is needed. ! and lighter monthly climoz files, inetrpolated in time at gcm run time. - + ok_new_lscp = .FALSE. CALL getin_p('ok_new_lscp', ok_new_lscp) @@ -1174,5 +1174,5 @@ read_fco2_ocean_cor_2d=.FALSE. CALL getin_p('read_fco2_ocean_cor_2d',read_fco2_ocean_cor_2d) - + read_fco2_land_cor_2d=.FALSE. CALL getin_p('read_fco2_land_cor_2d',read_fco2_land_cor_2d) @@ -1208,5 +1208,5 @@ END IF - + dms_cycle_cpl=.FALSE. CALL getin_p('transm_dms_oa',dms_cycle_cpl) @@ -1217,10 +1217,10 @@ CALL getin_p('transm_n2o_oa',n2o_cycle_cpl) ! - + ndp_cycle_cpl=.FALSE. CALL getin_p('transm_ndp_ao',ndp_cycle_cpl) ! - + nh3_cycle_cpl=.FALSE. CALL getin_p('transm_nh3_oa',nh3_cycle_cpl) @@ -1238,6 +1238,6 @@ -!FC -!AM + !FC + !AM @@ -1275,18 +1275,18 @@ !--test on radiative scheme IF (iflag_rrtm .EQ. 0) THEN - IF (NSW.NE.2) THEN - WRITE(lunout,*) 'conf_phys : ERROR iflag_rrtm=0 and NSW<>2 not possible' - CALL abort_physic('conf_phys','choice NSW not valid',1) - ENDIF + IF (NSW.NE.2) THEN + WRITE(lunout,*) 'conf_phys : ERROR iflag_rrtm=0 and NSW<>2 not possible' + CALL abort_physic('conf_phys','choice NSW not valid',1) + ENDIF ELSE IF (iflag_rrtm .EQ. 1) THEN - IF (NSW.NE.2.AND.NSW.NE.4.AND.NSW.NE.6) THEN - WRITE(lunout,*) 'conf_phys : ERROR iflag_rrtm=1 and NSW<>2,4,6 not possible' - CALL abort_physic('conf_phys','choice NSW not valid',1) - ENDIF - ELSE IF (iflag_rrtm .EQ. 2) THEN - IF (NSW.NE.2.AND.NSW.NE.4.AND.NSW.NE.6) THEN - WRITE(lunout,*) 'conf_phys : ERROR iflag_rrtm=1 and NSW<>2,4,6 not possible' - CALL abort_physic('conf_phys','choice NSW not valid',1) - ENDIF + IF (NSW.NE.2.AND.NSW.NE.4.AND.NSW.NE.6) THEN + WRITE(lunout,*) 'conf_phys : ERROR iflag_rrtm=1 and NSW<>2,4,6 not possible' + CALL abort_physic('conf_phys','choice NSW not valid',1) + ENDIF + ELSE IF (iflag_rrtm .EQ. 2) THEN + IF (NSW.NE.2.AND.NSW.NE.4.AND.NSW.NE.6) THEN + WRITE(lunout,*) 'conf_phys : ERROR iflag_rrtm=1 and NSW<>2,4,6 not possible' + CALL abort_physic('conf_phys','choice NSW not valid',1) + ENDIF ELSE WRITE(lunout,*) 'conf_phys : ERROR iflag_rrtm<>0,1' @@ -1294,17 +1294,17 @@ ENDIF !--here we test that solaire has not been changed if ok_suntime_rrtm is activated -! WRITE(lunout,*) 'conf_phys : ERROR ok_suntime_rrtm=y and solaire is provided in def file' -! CALL abort_physic('conf_phys','ok_suntime_rrtm=y and solaire is provided',1) -! ENDIF -IF (CPPKEY_STRATAER) THEN - IF (iflag_rrtm .NE. 1) THEN - WRITE(lunout,*) 'conf_phys : 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 - WRITE(lunout,*) 'conf_phys : ERROR NSW<>6 but StratAer activated' - CALL abort_physic('conf_phys','NSW not valid for StratAer',1) - ENDIF -END IF + ! WRITE(lunout,*) 'conf_phys : ERROR ok_suntime_rrtm=y and solaire is provided in def file' + ! CALL abort_physic('conf_phys','ok_suntime_rrtm=y and solaire is provided',1) + ! ENDIF + IF (CPPKEY_STRATAER) THEN + IF (iflag_rrtm .NE. 1) THEN + WRITE(lunout,*) 'conf_phys : 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 + WRITE(lunout,*) 'conf_phys : ERROR NSW<>6 but StratAer activated' + CALL abort_physic('conf_phys','NSW not valid for StratAer',1) + ENDIF + END IF !--test on ocean surface albedo @@ -1363,8 +1363,8 @@ IF (flag_volc_surfstrat.LT.0.OR.flag_volc_surfstrat.GT.2) THEN CALL abort_physic('conf_phys', 'flag_volc_surfstrat can only be 0 1 or 2',1) - ENDIF + ENDIF IF ((.NOT.ok_volcan.OR..NOT.ok_ade.OR..NOT.ok_aie).AND.flag_volc_surfstrat.GT.0) THEN CALL abort_physic('conf_phys', 'ok_ade, ok_aie, ok_volcan need to be activated if flag_volc_surfstrat is 1 or 2',1) - ENDIF + ENDIF ! Test on carbon cycle @@ -1376,5 +1376,5 @@ ENDIF -! << PC + ! << PC ! Consistency checks for CO2 driving philosophy ! If CO2 is concentration-driven for the surface components, the radiation @@ -1385,5 +1385,5 @@ WRITE(lunout,*) 'CO2 concentration-driven: radiation uses prescribed co2_ppm: atmospheric tracer is diagnostic only.' ENDIF -! >> PC + ! >> PC ! Test on chemistry cycle @@ -1391,5 +1391,5 @@ CALL abort_physic('conf_phys', 'transm_dms_oa, transm_n2o_oa, transm_ndp_ao or transm_nh3_oa can be TRUE only with INCA coupling model',1) ENDIF - + ! ORCHIDEE must be activated for ifl_pbltree=1 IF (.NOT. ok_veget .AND. ifl_pbltree==1) THEN @@ -1491,8 +1491,8 @@ WRITE(lunout,*) 'conf_phys : iflag_pbl = ', iflag_pbl WRITE(lunout,*) 'conf_phys : iflag_physiq = ', iflag_physiq -!FC + !FC WRITE(lunout,*) 'conf_phys : ifl_pbltree = ', ifl_pbltree WRITE(lunout,*) 'conf_phys : Cd_frein = ', Cd_frein -!AM + !AM WRITE(lunout,*) 'conf_phys : iflag_hetero_surf = ', iflag_hetero_surf WRITE(lunout,*) 'conf_phys : iflag_pbl_split = ', iflag_pbl_split @@ -1589,5 +1589,5 @@ WRITE(lunout,*) 'conf_phys : fseaN = ', fseaN WRITE(lunout,*) 'conf_phys : fseaS = ', fseaS - + WRITE(lunout,*) 'conf_phys : n2o_cycle_cpl = ', n2o_cycle_cpl WRITE(lunout,*) 'conf_phys : ndp_cycle_cpl = ', ndp_cycle_cpl @@ -1626,5 +1626,5 @@ SUBROUTINE conf_interface(tau_calv) - USE ioipsl_getin_p_mod, ONLY : getin_p + USE ioipsl_getin_p_mod, ONLY : getin_p USE IOIPSL