Index: /LMDZ6/trunk/libf/misc/lmdz_cosp_wrappers.F90 =================================================================== --- /LMDZ6/trunk/libf/misc/lmdz_cosp_wrappers.F90 (revision 5325) +++ /LMDZ6/trunk/libf/misc/lmdz_cosp_wrappers.F90 (revision 5325) @@ -0,0 +1,85 @@ +! cosp SUBROUTINE wrappers + +SUBROUTINE lmdz_cosp_wrapper_abort + STOP 'COSP/COSP2/COSPV2 key undefined, must not enter in COSP wrappers ==> aborting' +END SUBROUTINE lmdz_cosp_wrapper_abort + +#ifndef COSP + +SUBROUTINE phys_cosp(itap, dtime, freq_cosp, & + ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP, & + ecrit_mth, ecrit_day, ecrit_hf, ok_all_xml, missing_val, & + Nptslmdz, Nlevlmdz, lon, lat, presnivs, overlaplmdz, sunlit, & + ref_liq, ref_ice, fracTerLic, u_wind, v_wind, phis, phi, ph, p, skt, t, & + sh, rh, tca, cca, mr_lsliq, mr_lsice, fl_lsrainI, fl_lssnowI, & + fl_ccrainI, fl_ccsnowI, mr_ozone, dtau_s, dem_s) + + IMPLICIT NONE + + Integer :: Nptslmdz, Nlevlmdz ! Nb de points issus de physiq.F + + ! Declaration necessaires pour les sorties IOIPSL + integer :: ii + real :: ecrit_day, ecrit_hf, ecrit_mth, missing_val + logical :: ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP, ok_all_xml + + integer :: overlaplmdz ! overlap type: 1=max, 2=rand, 3=max/rand ! cosp input (output lmdz) + real, dimension(Nptslmdz, Nlevlmdz) :: height, phi, p, ph, T, sh, rh, tca, cca, mr_lsliq, mr_lsice, mr_ccliq, mr_ccice, & + fl_lsrain, fl_lssnow, fl_ccrain, fl_ccsnow, fl_lsgrpl, & + zlev, zlev_half, mr_ozone, radliq, radice, dtau_s, dem_s, ref_liq, ref_ice + real, dimension(Nptslmdz, Nlevlmdz) :: fl_lsrainI, fl_lssnowI, fl_ccrainI, fl_ccsnowI + real, dimension(Nptslmdz) :: lon, lat, skt, fracTerLic, u_wind, v_wind, phis, sunlit + real, dimension(Nlevlmdz) :: presnivs + integer :: itap, k, ip + real :: dtime, freq_cosp + real, dimension(2) :: time_bnds + + double precision :: d_dtime + double precision, dimension(2) :: d_time_bnds + + CALL lmdz_cosp_wrapper_abort + +END SUBROUTINE phys_cosp + +#endif + +#ifndef COSP2 + +subroutine phys_cosp2( itap,dtime,freq_cosp, ok_mensuelCOSP, ok_journeCOSP, & + ok_hfCOSP, ecrit_mth, ecrit_day, ecrit_hf, ok_all_xml, & + missing_val, Nptslmdz, Nlevlmdz, lon, lat, presnivs, & + overlaplmdz, sunlit, ref_liq, ref_ice, fracTerLic, & + u_wind, v_wind, phis, phi, ph, p, skt, t, sh, rh, & + tca, cca, mr_lsliq, mr_lsice, fl_lsrainI, fl_lssnowI, & + fl_ccrainI, fl_ccsnowI, mr_ozone, dtau_s, dem_s) + + IMPLICIT NONE + +!----------------------------- Input variables from LMDZ-GCM ------------------------------- + integer :: overlaplmdz ! overlap type: 1=max, + ! 2=rand, 3=max/rand + logical :: ok_mensuelcosp, ok_journecosp, ok_hfcosp, ok_all_xml + real :: ecrit_mth, ecrit_day, ecrit_hf, missing_val + integer :: nptslmdz, nlevlmdz + real, dimension(Nptslmdz,Nlevlmdz) :: phi, p, ph, T, sh, rh, tca, cca, mr_lsliq, & + mr_lsice, mr_ccliq, mr_ccice, fl_lsrain, & + fl_lssnow, fl_ccrain, fl_ccsnow, fl_lsgrpl, & + zlev, zlev_half, mr_ozone, radliq, radice, & + dtau_s, dem_s, dtau_c, dem_c, ref_liq, ref_ice + real, dimension(Nptslmdz,Nlevlmdz) :: fl_lsrainI, fl_lssnowI, fl_ccrainI, fl_ccsnowI + real, dimension(Nptslmdz) :: lon, lat, skt, fracTerLic, u_wind, v_wind, & + phis, sunlit + real, dimension(Nptslmdz) :: land ! variables intermediaire pour masque TerLic + real, dimension(Nlevlmdz) :: presnivs + integer :: itap, k, ip + real :: dtime, freq_cosp + real, dimension(2) :: time_bnds + + double precision :: d_dtime + double precision, dimension(2) :: d_time_bnds + + CALL lmdz_cosp_wrapper_abort + +end subroutine phys_cosp2 + +#endif Index: /LMDZ6/trunk/libf/misc/lmdz_cppkeys_wrapper.F90 =================================================================== --- /LMDZ6/trunk/libf/misc/lmdz_cppkeys_wrapper.F90 (revision 5324) +++ /LMDZ6/trunk/libf/misc/lmdz_cppkeys_wrapper.F90 (revision 5325) @@ -29,67 +29,67 @@ #ifdef NC_DOUBLE - INTEGER :: nf90_format = nf90_double + INTEGER, PARAMETER :: nf90_format = nf90_double #else - INTEGER :: nf90_format = nf90_float + INTEGER, PARAMETER :: nf90_format = nf90_float #endif #ifdef CPP_PHYS - LOGICAL :: CPPKEY_PHYS = .TRUE. + LOGICAL, PARAMETER :: CPPKEY_PHYS = .TRUE. #else - LOGICAL :: CPPKEY_PHYS = .FALSE. + LOGICAL, PARAMETER :: CPPKEY_PHYS = .FALSE. #endif #ifdef INCA - LOGICAL :: CPPKEY_INCA = .TRUE. + LOGICAL, PARAMETER :: CPPKEY_INCA = .TRUE. #else - LOGICAL :: CPPKEY_INCA = .FALSE. + LOGICAL, PARAMETER :: CPPKEY_INCA = .FALSE. #endif #ifdef REPROBUS - LOGICAL :: CPPKEY_REPROBUS = .TRUE. + LOGICAL, PARAMETER :: CPPKEY_REPROBUS = .TRUE. #else - LOGICAL :: CPPKEY_REPROBUS = .FALSE. + LOGICAL, PARAMETER :: CPPKEY_REPROBUS = .FALSE. #endif #ifdef CPP_StratAer - LOGICAL :: CPPKEY_STRATAER = .TRUE. + LOGICAL, PARAMETER :: CPPKEY_STRATAER = .TRUE. #else - LOGICAL :: CPPKEY_STRATAER = .FALSE. + LOGICAL, PARAMETER :: CPPKEY_STRATAER = .FALSE. #endif #ifdef CPP_DUST - LOGICAL :: CPPKEY_DUST = .TRUE. + LOGICAL, PARAMETER :: CPPKEY_DUST = .TRUE. #else - LOGICAL :: CPPKEY_DUST = .FALSE. + LOGICAL, PARAMETER :: CPPKEY_DUST = .FALSE. #endif #ifdef CPP_INLANDSIS - LOGICAL :: CPPKEY_INLANDSIS = .TRUE. + LOGICAL, PARAMETER :: CPPKEY_INLANDSIS = .TRUE. #else - LOGICAL :: CPPKEY_INLANDSIS = .FALSE. + LOGICAL, PARAMETER :: CPPKEY_INLANDSIS = .FALSE. #endif #ifdef OUTPUT_PHYS_SCM - LOGICAL :: CPPKEY_OUTPUTPHYSSCM = .TRUE. + LOGICAL, PARAMETER :: CPPKEY_OUTPUTPHYSSCM = .TRUE. #else - LOGICAL :: CPPKEY_OUTPUTPHYSSCM = .FALSE. + LOGICAL, PARAMETER :: CPPKEY_OUTPUTPHYSSCM = .FALSE. #endif #ifdef CPP_COSP - LOGICAL :: CPPKEY_COSP = .TRUE. + LOGICAL, PARAMETER :: CPPKEY_COSP = .TRUE. #else - LOGICAL :: CPPKEY_COSP = .FALSE. + LOGICAL, PARAMETER :: CPPKEY_COSP = .FALSE. #endif #ifdef CPP_COSP2 - LOGICAL :: CPPKEY_COSP2 = .TRUE. + LOGICAL, PARAMETER :: CPPKEY_COSP2 = .TRUE. #else - LOGICAL :: CPPKEY_COSP2 = .FALSE. + LOGICAL, PARAMETER :: CPPKEY_COSP2 = .FALSE. #endif #ifdef CPP_COSPV2 - LOGICAL :: CPPKEY_COSPV2 = .TRUE. + LOGICAL, PARAMETER :: CPPKEY_COSPV2 = .TRUE. #else - LOGICAL :: CPPKEY_COSPV2 = .FALSE. + LOGICAL, PARAMETER :: CPPKEY_COSPV2 = .FALSE. #endif Index: /LMDZ6/trunk/libf/misc/lmdz_inca_wrappers.F90 =================================================================== --- /LMDZ6/trunk/libf/misc/lmdz_inca_wrappers.F90 (revision 5324) +++ /LMDZ6/trunk/libf/misc/lmdz_inca_wrappers.F90 (revision 5325) @@ -349,3 +349,25 @@ END SUBROUTINE init_inca_para +SUBROUTINE aerosolmain(aerosol_couple,tr_seri,pdtphys, & + pplay,pdel,prfl,pmflxr,psfl, & + pmflxs,zpmfu,itop_con,ibas_con, & + pphi,cell_area,nstep,rneb,t_seri, & + rh,tau_aero,piz_aero,cg_aero, & + rfname,ccm,lafin) + REAL :: aerosol_couple,tr_seri,pdtphys, & + pplay,pdel,prfl,pmflxr,psfl, & + pmflxs,zpmfu,itop_con,ibas_con, & + pphi,cell_area,rneb,t_seri, & + rh,tau_aero,piz_aero,cg_aero, & + rfname,ccm,lafin + INTEGER :: nstep + CALL lmdz_inca_wrapper_abort +END SUBROUTINE aerosolmain + +SUBROUTINE chemmain(tr_seri, xlon, xlat, t_seri, pplay, paprs, pphi, pphis, presnivs, sh, debutphy) + REAL :: tr_seri(:,:,:), xlon(:), xlat(:), t_seri(:,:), pplay(:,:), paprs(:,:), pphi(:,:), pphis(:), presnivs(:), sh(:,:) + LOGICAL :: debutphy + CALL lmdz_inca_wrapper_abort +END SUBROUTINE chemmain + #endif Index: /LMDZ6/trunk/libf/misc/lmdz_reprobus_wrappers.F90 =================================================================== --- /LMDZ6/trunk/libf/misc/lmdz_reprobus_wrappers.F90 (revision 5324) +++ /LMDZ6/trunk/libf/misc/lmdz_reprobus_wrappers.F90 (revision 5325) @@ -51,10 +51,12 @@ SUBROUTINE chemini_rep(presnivs, pdtphys, annee_ref, day_ref, day_ini, start_time, itau_phy, io_lon, io_lat) - INTEGER :: presnivs, pdtphys, annee_ref, day_ref, day_ini, start_time, itau_phy, io_lon, io_lat + INTEGER :: annee_ref, day_ref, day_ini, itau_phy + REAL :: presnivs(:), pdtphys, start_time, io_lon(:), io_lat(:) CALL lmdz_reprobus_wrapper_abort END SUBROUTINE chemini_rep SUBROUTINE chemtime_rep(it, date, tstep, itap) - INTEGER :: it, date, tstep, itap + INTEGER :: it, itap + REAL :: date, tstep CALL lmdz_reprobus_wrapper_abort END SUBROUTINE chemtime_rep @@ -71,4 +73,15 @@ END SUBROUTINE chemmain_rlong_1401 + SUBROUTINE rtime(debut) + LOGICAL :: debut + CALL lmdz_reprobus_wrapper_abort + END SUBROUTINE rtime + + SUBROUTINE rad_interactif(pozon, iof) + real :: pozon(:,:,:) + integer :: iof + CALL lmdz_reprobus_wrapper_abort + END SUBROUTINE rad_interactif + #endif END MODULE lmdz_reprobus_wrappers Index: /LMDZ6/trunk/libf/phylmd/physiq_mod.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 5324) +++ /LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 5325) @@ -108,5 +108,6 @@ USE infotrac_phy, ONLY: nqCO2 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, chemini_rep, chemtime_rep, coord_hyb_rep + ptrop, ttrop, ztrop, gravit, itroprep, Z1, Z2, fac, B, chemini_rep, chemtime_rep, coord_hyb_rep, & + rtime USE strataer_local_var_mod USE strataer_emiss_mod, ONLY: strataer_emiss_init Index: /LMDZ6/trunk/libf/phylmd/radlwsw_m.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmd/radlwsw_m.F90 (revision 5324) +++ /LMDZ6/trunk/libf/phylmd/radlwsw_m.F90 (revision 5325) @@ -53,5 +53,5 @@ USE write_field_phy - USE lmdz_reprobus_wrappers, ONLY : solaireTIME, ok_SUNTIME, ndimozon + USE lmdz_reprobus_wrappers, ONLY : solaireTIME, ok_SUNTIME, ndimozon, rad_interactif USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_REPROBUS Index: /LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 =================================================================== --- /LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 5324) +++ /LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 5325) @@ -109,6 +109,7 @@ USE time_phylmdz_mod, ONLY: ndays USE infotrac_phy, ONLY: nqCO2 - 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 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, chemini_rep, chemtime_rep, coord_hyb_rep, & + rtime USE strataer_local_var_mod USE strataer_emiss_mod, ONLY: strataer_emiss_init