Index: /LMDZ6/trunk/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90 (revision 5294) @@ -11,5 +11,7 @@ USE aero_mod USE YOMCST, ONLY: RG - +! Temporary fix waiting for cleaner interface (or not) + USE clesphys_mod_h, ONLY: NSW + ! Yves Balkanski le 12 avril 2006 ! Celine Deandreis @@ -21,5 +23,5 @@ IMPLICIT NONE ! - INCLUDE "clesphys.h" +!! INCLUDE "clesphys.h" ! ! Input arguments: Index: /LMDZ6/trunk/libf/phylmd/rrtm/aeropt_lw_rrtm.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/aeropt_lw_rrtm.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/aeropt_lw_rrtm.F90 (revision 5294) @@ -15,8 +15,10 @@ USE YOERAD, ONLY: NLW USE YOMCST, ONLY: RG - +! Temporary fix waiting for cleaner interface (or not) + USE clesphys_mod_h, ONLY: NSW + IMPLICIT NONE - INCLUDE "clesphys.h" +!! INCLUDE "clesphys.h" ! ! Input arguments: Index: DZ6/trunk/libf/phylmd/rrtm/clesphys.h =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/clesphys.h (revision 5293) +++ (revision ) @@ -1,168 +1,0 @@ -! $Id: clesphys.h 5204 2024-09-20 11:28:24Z fairhead $ -! -! ATTENTION!!!!: ce fichier include est compatible format fixe/format libre -! veillez \`a n'utiliser que des ! pour les commentaires -! et \`a bien positionner les & des lignes de continuation -! (les placer en colonne 6 et en colonne 73) -! -!..include cles_phys.h - - ! threshold on to activate SSO schemes - REAL zrel_oro_t, zpmm_orodr_t, zpmm_orolf_t, zstd_orodr_t - INTEGER iflag_cycle_diurne - LOGICAL soil_model,new_oliq,ok_orodr,ok_orolf - LOGICAL ok_limitvrai - LOGICAL ok_all_xml - LOGICAL ok_lwoff - INTEGER nbapp_rad, iflag_con, nbapp_cv, nbapp_wk, iflag_ener_conserv - REAL co2_ppm, co2_ppm0, solaire - INTEGER iflag_thermals,nsplit_thermals - INTEGER iflag_physiq - REAL tau_thermals - -!FC - REAL Cd_frein - LOGICAL ok_suntime_rrtm - REAL(kind=8) RCO2, RCH4, RN2O, RCFC11, RCFC12 - REAL(kind=8) RCO2_act, RCH4_act, RN2O_act, RCFC11_act, RCFC12_act - REAL(kind=8) CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt -!IM ajout CFMIP2/CMIP5 - REAL(kind=8) RCO2_per,RCH4_per,RN2O_per,RCFC11_per,RCFC12_per - REAL(kind=8) CH4_ppb_per,N2O_ppb_per,CFC11_ppt_per,CFC12_ppt_per - -!OM ---> correction du bilan d'eau global -!OM Correction sur precip KE - REAL cvl_corr -!OM Fonte calotte dans bilan eau - LOGICAL ok_lic_melt -!OB Depot de vapeur d eau sur la calotte pour le bilan eau - LOGICAL ok_lic_cond - -!IM simulateur ISCCP - INTEGER top_height, overlap -!IM seuils cdrm, cdrh - REAL cdmmax, cdhmax -!IM pour les params différentes Olivier Torres - INTEGER choix_bulk, nit_bulk, kz0 -!IM param. stabilite s/ terres et en dehors - REAL ksta, ksta_ter, f_ri_cd_min -!IM ok_kzmin : clef calcul Kzmin dans la CL de surface cf FH - LOGICAL ok_kzmin -!IM, MAFo fmagic, pmagic : parametres - additionnel et multiplicatif - -! pour regler l albedo sur ocean - REAL fmagic, pmagic -! Hauteur (imposee) du contenu en eau du sol - REAL qsol0,albsno0,evap0 -! Frottement au sol (Cdrag) - Real f_cdrag_ter,f_cdrag_oce - REAL min_wind_speed,f_gust_wk,f_gust_bl,f_qsat_oce,f_z0qh_oce - REAL z0m_seaice,z0h_seaice - REAL z0m_landice, z0h_landice - INTEGER iflag_gusts,iflag_z0_oce - -! Rugoro - Real f_rugoro,z0min - -! tau_gl : constante de rappel de la temperature a la surface de la glace - REAL tau_gl - -!IM lev_histhf : niveau sorties 6h -!IM lev_histday : niveau sorties journalieres -!IM lev_histmth : niveau sorties mensuelles -!IM lev_histdayNMC : on peut sortir soit sur 8 (comme AR5) ou bien -! sur 17 niveaux de pression - INTEGER lev_histhf, lev_histday, lev_histmth - INTEGER lev_histdayNMC - Integer lev_histins, lev_histLES -!IM ok_histNMC : sortie fichiers niveaux de pression (histmthNMC, histdayNMC, histhfNMC) -!IM freq_outNMC : frequences de sortie fichiers niveaux de pression (histmthNMC, histdayNMC, histhfNMC) -!IM freq_calNMC : frequences de calcul fis. hist*NMC.nc - LOGICAL ok_histNMC(3) - INTEGER levout_histNMC(3) - REAL freq_outNMC(3) , freq_calNMC(3) - CHARACTER(len=4) type_run -! aer_type: pour utiliser un fichier constant dans readaerosol - CHARACTER(len=8) :: aer_type - LOGICAL ok_regdyn - REAL lonmin_ins, lonmax_ins, latmin_ins, latmax_ins - REAL ecrit_ins, ecrit_hf, ecrit_day - REAL ecrit_mth, ecrit_tra, ecrit_reg - REAL ecrit_LES - REAL freq_ISCCP, ecrit_ISCCP - REAL freq_COSP, freq_AIRS - LOGICAL :: ok_cosp,ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP - LOGICAL :: ok_airs - INTEGER :: ip_ebil_phy, iflag_rrtm, iflag_ice_thermo, NSW, iflag_albedo - LOGICAL :: ok_ice_supersat, ok_plane_h2o, ok_plane_contrail - LOGICAL :: ok_chlorophyll - LOGICAL :: ok_strato - LOGICAL :: ok_hines, ok_gwd_rando - LOGICAL :: ok_qch4 - LOGICAL :: ok_conserv_q - LOGICAL :: adjust_tropopause - LOGICAL :: ok_daily_climoz - LOGICAL :: ok_new_lscp - LOGICAL :: ok_bs, ok_rad_bs -! flag to bypass or not the phytrac module - INTEGER :: iflag_phytrac - -!AI flags pour ECRAD - LOGICAL :: ok_3Deffect - -!OB flag to activate water mass fixer in physiq - LOGICAL :: ok_water_mass_fixer - - COMMON/clesphys/ & -! REAL FIRST -! rajout choix_bulk et nit_bulk kz0 par Olivier Torres - & co2_ppm, solaire & - & , RCO2, RCH4, RN2O, RCFC11, RCFC12 & - & , RCO2_act, RCH4_act, RN2O_act, RCFC11_act, RCFC12_act & - & , RCO2_per, RCH4_per, RN2O_per, RCFC11_per, RCFC12_per & - & , CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt & - & , CH4_ppb_per, N2O_ppb_per, CFC11_ppt_per, CFC12_ppt_per & - & , cdmmax,cdhmax,ksta,ksta_ter,f_ri_cd_min & - & , fmagic, pmagic & - & , f_cdrag_ter,f_cdrag_oce,f_rugoro,z0min,tau_gl & - & , min_wind_speed,f_gust_wk,f_gust_bl,f_qsat_oce,f_z0qh_oce & - & , z0m_seaice,z0h_seaice,z0m_landice,z0h_landice & - & , freq_outNMC, freq_calNMC & - & , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins & - & , freq_ISCCP, ecrit_ISCCP, freq_COSP, freq_AIRS & - & , cvl_corr & - & , qsol0,albsno0,evap0 & - & , co2_ppm0 & -!FC - & , Cd_frein,zrel_oro_t,zpmm_orodr_t,zpmm_orolf_t,zstd_orodr_t & - & , ecrit_LES & - & , ecrit_ins, ecrit_hf, ecrit_day & - & , ecrit_mth, ecrit_tra, ecrit_reg & -! THEN INTEGER AND LOGICALS - & , top_height & - & , iflag_cycle_diurne, soil_model, new_oliq & - & , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad & - & , iflag_con, nbapp_cv, nbapp_wk & - & , choix_bulk, nit_bulk, kz0 & - & , iflag_ener_conserv & - & , ok_suntime_rrtm & - & , overlap & - & , ok_kzmin & - & , lev_histhf, lev_histday, lev_histmth & - & , lev_histins, lev_histLES, lev_histdayNMC, levout_histNMC & - & , ok_histNMC & - & , type_run, ok_regdyn, ok_cosp, ok_airs & - & , ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP & - & , ip_ebil_phy & - & , iflag_gusts ,iflag_z0_oce & - & , ok_lic_melt, ok_lic_cond, aer_type & - & , iflag_rrtm, ok_strato,ok_hines, ok_qch4 & - & , iflag_ice_thermo, ok_ice_supersat & - & , ok_plane_h2o, ok_plane_contrail & - & , ok_gwd_rando, NSW, iflag_albedo & - & , ok_chlorophyll,ok_conserv_q, adjust_tropopause & - & , ok_daily_climoz, ok_all_xml, ok_lwoff & - & , iflag_phytrac, ok_new_lscp, ok_bs, ok_rad_bs & - & , iflag_thermals,nsplit_thermals, tau_thermals & - & , iflag_physiq, ok_3Deffect, ok_water_mass_fixer - save /clesphys/ -!$OMP THREADPRIVATE(/clesphys/) Index: /LMDZ6/trunk/libf/phylmd/rrtm/lwu.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/lwu.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/lwu.F90 (revision 5294) @@ -77,4 +77,6 @@ USE infotrac_phy, ONLY : type_trac USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_REPROBUS +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW, RCFC11, RCFC12, RCH4, RN2O IMPLICIT NONE @@ -94,5 +96,5 @@ REAL(KIND=JPRB) ,INTENT(OUT) :: PABCU(KLON,NUA,3*KLEV+1) -#include "clesphys.h" +!!include "clesphys.h" !----------------------------------------------------------------------- Index: /LMDZ6/trunk/libf/phylmd/rrtm/radlsw.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/radlsw.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/radlsw.F90 (revision 5294) @@ -16,4 +16,6 @@ use write_field_phy +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW !**** *RADLSW* - INTERFACE TO ECMWF LW AND SW RADIATION SCHEMES @@ -155,5 +157,5 @@ IMPLICIT NONE -include "clesphys.h" +!!include "clesphys.h" !!include "clesrrtm.h" include "YOETHF.h" Index: /LMDZ6/trunk/libf/phylmd/rrtm/radlsw.intfb.h =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/radlsw.intfb.h (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/radlsw.intfb.h (revision 5294) @@ -21,5 +21,7 @@ & RCCNLND, RCCNSEA, RLWINHF, RSWINHF, RRe2De ,& & LEDBUG -include "clesphys.h" +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON INTEGER(KIND=JPIM),INTENT(IN) :: KLEV Index: /LMDZ6/trunk/libf/phylmd/rrtm/read_rsun_rrtm.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/read_rsun_rrtm.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/read_rsun_rrtm.F90 (revision 5294) @@ -17,8 +17,10 @@ USE YOESW, ONLY : RSUN - +! Temporary fix waiting for cleaner interface (or not) + USE clesphys_mod_h, ONLY: NSW, solaire + IMPLICIT NONE - INCLUDE "clesphys.h" +!! INCLUDE "clesphys.h" ! Input arguments Index: /LMDZ6/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (revision 5294) @@ -22,8 +22,10 @@ USE infotrac_phy, ONLY: tracers, nqtot, nbtr USE YOMCST - +! Temporary fix waiting for cleaner interface (or not) + USE clesphys_mod_h, ONLY: NSW + IMPLICIT NONE - include "clesphys.h" +!! include "clesphys.h" ! Input arguments Index: /LMDZ6/trunk/libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90 (revision 5294) @@ -20,8 +20,10 @@ USE YOMCST USE lmdz_xios - +! Temporary fix waiting for cleaner interface (or not) + USE clesphys_mod_h, ONLY: NSW + IMPLICIT NONE - INCLUDE "clesphys.h" +!! INCLUDE "clesphys.h" CHARACTER (len = 80) :: abort_message Index: /LMDZ6/trunk/libf/phylmd/rrtm/recmwf_aero.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/recmwf_aero.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/recmwf_aero.F90 (revision 5294) @@ -164,5 +164,7 @@ USE YOMARPHY , ONLY : LRDUST USE phys_output_mod, ONLY : swaerofree_diag, swaero_diag - +! Temporary fix waiting for cleaner interface (or not) + USE clesphys_mod_h, ONLY: NSW + !----------------------------------------------------------------------- @@ -171,5 +173,5 @@ IMPLICIT NONE - INCLUDE "clesphys.h" +!! INCLUDE "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KPROMA Index: /LMDZ6/trunk/libf/phylmd/rrtm/rrtm_ecrt_140gp.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/rrtm_ecrt_140gp.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/rrtm_ecrt_140gp.F90 (revision 5294) @@ -33,4 +33,6 @@ !MPL/IM 20160915 on prend GES de phylmd USE YOERDI , ONLY : RCH4 ,RN2O ,RCFC11 ,RCFC12 USE YOESW , ONLY : RAER +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW, rcfc11, rcfc12, rch4, rn2o !------------------------------Arguments-------------------------------- @@ -114,5 +116,5 @@ !MPL/IM 20160915 on prend GES de phylmd -#include "clesphys.h" +!!#include "clesphys.h" ! *** Index: /LMDZ6/trunk/libf/phylmd/rrtm/rrtm_rrtm_140gp.intfb.h =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/rrtm_rrtm_140gp.intfb.h (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/rrtm_rrtm_140gp.intfb.h (revision 5294) @@ -14,5 +14,7 @@ & JPINPX !-NLW in clesphys now OB -include "clesphys.h" +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON INTEGER(KIND=JPIM),INTENT(IN) :: KLEV Index: /LMDZ6/trunk/libf/phylmd/rrtm/srtm_srtm_224gp.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/srtm_srtm_224gp.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/srtm_srtm_224gp.F90 (revision 5294) @@ -23,10 +23,11 @@ USE YOMPHY3 , ONLY : RII0 USE YOMCST , ONLY : RI0 - +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW, rch4, rn2o IMPLICIT NONE -#include "clesphys.h" +!!#include "clesphys.h" !-- Input arguments Index: /LMDZ6/trunk/libf/phylmd/rrtm/srtm_srtm_224gp_mcica.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/srtm_srtm_224gp_mcica.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/srtm_srtm_224gp_mcica.F90 (revision 5294) @@ -21,4 +21,6 @@ USE YOMPHY3 , ONLY : RII0 USE YOMCST , ONLY : RI0 +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW, rch4, rn2o IMPLICIT NONE @@ -134,5 +136,5 @@ #include "srtm_spcvrt_mcica.intfb.h" !MPL/IM 20160915 on prend GES de phylmd -#include "clesphys.h" +!!#include "clesphys.h" !----------------------------------------------------------------------- Index: /LMDZ6/trunk/libf/phylmd/rrtm/suecrad.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/suecrad.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/suecrad.F90 (revision 5294) @@ -155,4 +155,7 @@ USE YOMDYN , ONLY : NDLNPR +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW, CFC11_ppt, CFC12_ppt, CH4_ppb, CO2_ppm, iflag_rrtm, N2O_ppb, overlap + IMPLICIT NONE @@ -243,5 +246,5 @@ ! ---------------------------------------------------------------- -#include "clesphys.h" +!#include "clesphys.h" #include "naerad.h" #include "namrgri.h" Index: /LMDZ6/trunk/libf/phylmd/rrtm/suecrad15.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/suecrad15.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/suecrad15.F90 (revision 5294) @@ -78,8 +78,10 @@ USE YOMPRAD , ONLY : LODBGRADI,LODBGRADL USE YOMRADF , ONLY : EMTD ,EMTU ,TRSW ,RMOON +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW IMPLICIT NONE -include "clesphys.h" +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLEV Index: /LMDZ6/trunk/libf/phylmd/rrtm/suphec.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/suphec.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/suphec.F90 (revision 5294) @@ -88,8 +88,10 @@ USE YOMCT0 , ONLY : LSCMEC ,LROUGH ,REXTZ0M ,REXTZ0H USE vertical_layers_mod, ONLY: ap,bp +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW IMPLICIT NONE include "YOETHF.h" -include "clesphys.h" +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KULOUT Index: /LMDZ6/trunk/libf/phylmd/rrtm/sw.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/sw.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/sw.F90 (revision 5294) @@ -74,8 +74,10 @@ ! NSW mis dans .def MPL 20140211 USE write_field_phy +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW IMPLICIT NONE -include "clesphys.h" +!!include "clesphys.h" integer, save :: icount=0 Index: /LMDZ6/trunk/libf/phylmd/rrtm/sw.intfb.h =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/sw.intfb.h (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/sw.intfb.h (revision 5294) @@ -13,5 +13,7 @@ & ) USE PARKIND1 ,ONLY : JPIM ,JPRB -include "clesphys.h" +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON INTEGER(KIND=JPIM),INTENT(IN) :: KLEV Index: /LMDZ6/trunk/libf/phylmd/rrtm/sw1s.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/sw1s.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/sw1s.F90 (revision 5294) @@ -73,8 +73,10 @@ ! NSW mis dans .def MPL 20140211 USE write_field_phy +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW IMPLICIT NONE -include "clesphys.h" +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON Index: /LMDZ6/trunk/libf/phylmd/rrtm/sw1s.intfb.h =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/sw1s.intfb.h (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/sw1s.intfb.h (revision 5294) @@ -8,5 +8,7 @@ & ) USE PARKIND1 ,ONLY : JPIM ,JPRB -include "clesphys.h" +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON INTEGER(KIND=JPIM),INTENT(IN) :: KLEV Index: /LMDZ6/trunk/libf/phylmd/rrtm/swclr.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/swclr.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/swclr.F90 (revision 5294) @@ -70,7 +70,9 @@ USE YOERDI , ONLY : REPCLC USE YOERDU , ONLY : REPSCT +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW IMPLICIT NONE -INCLUDE "clesphys.h" +!!INCLUDE "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON Index: /LMDZ6/trunk/libf/phylmd/rrtm/swclr.intfb.h =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/swclr.intfb.h (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/swclr.intfb.h (revision 5294) @@ -8,5 +8,7 @@ USE PARKIND1 ,ONLY : JPIM ,JPRB USE YOERAD , ONLY : NOVLP -include "clesphys.h" +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON INTEGER(KIND=JPIM),INTENT(IN) :: KLEV Index: /LMDZ6/trunk/libf/phylmd/rrtm/swni.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/swni.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/swni.F90 (revision 5294) @@ -81,8 +81,10 @@ USE YOERDU , ONLY : REPLOG ,REPSCQ ,REPSC USE write_field_phy +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW IMPLICIT NONE -include "clesphys.h" +!!include "clesphys.h" character*1 str1 Index: /LMDZ6/trunk/libf/phylmd/rrtm/swni.intfb.h =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/swni.intfb.h (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/swni.intfb.h (revision 5294) @@ -9,5 +9,7 @@ USE PARKIND1 ,ONLY : JPIM ,JPRB USE YOERAD , ONLY : NOVLP -include "clesphys.h" +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON INTEGER(KIND=JPIM),INTENT(IN) :: KLEV Index: /LMDZ6/trunk/libf/phylmd/rrtm/swr.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/swr.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/swr.F90 (revision 5294) @@ -66,8 +66,10 @@ USE YOEOVLP , ONLY : RA1OVLP USE write_field_phy +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW IMPLICIT NONE -include "clesphys.h" +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON INTEGER(KIND=JPIM),INTENT(IN) :: KLEV Index: /LMDZ6/trunk/libf/phylmd/rrtm/swr.intfb.h =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/swr.intfb.h (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/swr.intfb.h (revision 5294) @@ -8,5 +8,7 @@ USE PARKIND1 ,ONLY : JPIM ,JPRB USE YOERAD , ONLY : NOVLP -include "clesphys.h" +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON INTEGER(KIND=JPIM),INTENT(IN) :: KLEV Index: /LMDZ6/trunk/libf/phylmd/rrtm/swu.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/swu.F90 (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/swu.F90 (revision 5294) @@ -64,8 +64,10 @@ & RTDH2O ,RTDUMG ,RTH2O ,RTUMG USE YOEOVLP , ONLY : RA1OVLP +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW IMPLICIT NONE -include "clesphys.h" +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON INTEGER(KIND=JPIM),INTENT(IN) :: KLEV Index: /LMDZ6/trunk/libf/phylmd/rrtm/swu.intfb.h =================================================================== --- /LMDZ6/trunk/libf/phylmd/rrtm/swu.intfb.h (revision 5293) +++ /LMDZ6/trunk/libf/phylmd/rrtm/swu.intfb.h (revision 5294) @@ -7,5 +7,7 @@ USE PARKIND1 ,ONLY : JPIM ,JPRB USE YOERAD , ONLY : NOVLP -include "clesphys.h" +! Temporary fix waiting for cleaner interface (or not) +USE clesphys_mod_h, ONLY: NSW +!!include "clesphys.h" INTEGER(KIND=JPIM),INTENT(IN) :: KLON INTEGER(KIND=JPIM),INTENT(IN) :: KLEV