Index: LMDZ6/trunk/libf/phylmd/chemistry_cycle_mod.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/chemistry_cycle_mod.f90 (revision 5771) +++ LMDZ6/trunk/libf/phylmd/chemistry_cycle_mod.f90 (revision 5773) @@ -15,13 +15,15 @@ ! Variables read from parmeter file physiq.def - LOGICAL, SAVE, PUBLIC :: dms_cycle_cpl ! Coupling of DMS fluxes between LMDZ/ORCHIDEE and LMDZ/OCEAN(PISCES) + LOGICAL, SAVE, PUBLIC :: dms_cycle_cpl ! Coupling of DMS fluxes between INCA and PISCES !$OMP THREADPRIVATE(dms_cycle_cpl) - LOGICAL, SAVE, PUBLIC :: n2o_cycle_cpl ! Coupling of N2O fluxes between LMDZ/ORCHIDEE and LMDZ/OCEAN(PISCES) + LOGICAL, SAVE, PUBLIC :: n2o_cycle_cpl ! Coupling of N2O fluxes between INCA and PISCES / PISCES and INCA !$OMP THREADPRIVATE(n2o_cycle_cpl) - LOGICAL, SAVE, PUBLIC :: ndp_cycle_cpl ! Coupling of N deposition between LMDZ/ORCHIDEE and LMDZ/OCEAN(PISCES) + LOGICAL, SAVE, PUBLIC :: ndp_cycle_cpl ! Coupling of N deposition between INCA and PISCES !$OMP THREADPRIVATE(ndp_cycle_cpl) + LOGICAL, SAVE, PUBLIC :: nh3_cycle_cpl ! Coupling of NH3 fluxes between PISCES and INCA +!$OMP THREADPRIVATE(nh3_cycle_cpl) END MODULE chemistry_cycle_mod Index: LMDZ6/trunk/libf/phylmd/conf_phys_m.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/conf_phys_m.f90 (revision 5771) +++ LMDZ6/trunk/libf/phylmd/conf_phys_m.f90 (revision 5773) @@ -36,5 +36,5 @@ 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 - USE chemistry_cycle_mod, ONLY: dms_cycle_cpl, n2o_cycle_cpl, ndp_cycle_cpl + USE chemistry_cycle_mod, ONLY: dms_cycle_cpl, n2o_cycle_cpl, ndp_cycle_cpl, nh3_cycle_cpl USE mod_grid_phy_lmdz, ONLY: klon_glo USE print_control_mod, ONLY: lunout @@ -240,5 +240,5 @@ LOGICAL, SAVE :: carbon_cycle_cpl_omp LOGICAL, SAVE :: carbon_cycle_rad_omp - LOGICAL, SAVE :: dms_cycle_cpl_omp, n2o_cycle_cpl_omp, ndp_cycle_cpl_omp + LOGICAL, SAVE :: dms_cycle_cpl_omp, n2o_cycle_cpl_omp, ndp_cycle_cpl_omp, nh3_cycle_cpl_omp INTEGER, SAVE :: level_coupling_esm_omp LOGICAL, SAVE :: read_fco2_ocean_cor_omp @@ -2411,5 +2411,14 @@ !Config Desc = send ndep to pisces via oasis !Config Def = .FALSE. - !Config Help = can be activated only if lmdz use inca for the atmospheric chemistry + !Config Help = can be activated only if lmdz use inca for the atmospheric chemistry + + + nh3_cycle_cpl_omp=.FALSE. + CALL getin('transm_nh3_oa',nh3_cycle_cpl_omp) + ! + !Config Key = nh3_cycle_cpl + !Config Desc = send nh3 from and to pisces via oasis + !Config Def = .FALSE. + !Config Help = can be activated only if lmdz use inca for the atmospheric chemistry !$OMP END MASTER @@ -2712,4 +2721,5 @@ n2o_cycle_cpl = n2o_cycle_cpl_omp ndp_cycle_cpl = ndp_cycle_cpl_omp + nh3_cycle_cpl = nh3_cycle_cpl_omp !rajout Olivier Torres kz0=kz0_omp @@ -2837,6 +2847,6 @@ ! Test on chemistry cycle - IF ((type_trac .ne. "inca" .AND. type_trac .ne. "inco") .AND. ( dms_cycle_cpl .OR. n2o_cycle_cpl .OR. ndp_cycle_cpl ) ) THEN - CALL abort_physic('conf_phys', 'dms_cycle_cpl, n2o_cycle_cpl or ndp_cycle_cpl can be TRUE only with INCA coupling model',1) + IF ((type_trac .ne. "inca" .AND. type_trac .ne. "inco") .AND. ( dms_cycle_cpl .OR. n2o_cycle_cpl .OR. ndp_cycle_cpl .OR. nh3_cycle_cpl ) ) THEN + 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 @@ -3075,4 +3085,5 @@ WRITE(lunout,*) ' n2o_cycle_cpl = ', n2o_cycle_cpl WRITE(lunout,*) ' ndp_cycle_cpl = ', ndp_cycle_cpl + WRITE(lunout,*) ' nh3_cycle_cpl = ', nh3_cycle_cpl WRITE(lunout,*) ' iflag_tsurf_inlandsis = ', iflag_tsurf_inlandsis WRITE(lunout,*) ' iflag_temp_inlandsis = ', iflag_temp_inlandsis Index: LMDZ6/trunk/libf/phylmd/oasis.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/oasis.F90 (revision 5771) +++ LMDZ6/trunk/libf/phylmd/oasis.F90 (revision 5773) @@ -63,6 +63,7 @@ INTEGER, PARAMETER :: ids_atmn2o = 35 INTEGER, PARAMETER :: ids_atmndp = 36 + INTEGER, PARAMETER :: ids_atmnh3 = 37 - INTEGER, PARAMETER :: maxsend = 36 ! Maximum number of fields to send + INTEGER, PARAMETER :: maxsend = 37 ! Maximum number of fields to send INTEGER, PARAMETER :: maxsend_phys = 34 ! Maximum number of fields to send in LMDZ phys - the last one will be send by Inca @@ -81,6 +82,7 @@ INTEGER, PARAMETER :: idr_ocedms = 10 INTEGER, PARAMETER :: idr_ocen2o = 11 - - INTEGER, PARAMETER :: maxrecv = 11 ! Maximum number of fields to receive + INTEGER, PARAMETER :: idr_ocenh3 = 12 + + INTEGER, PARAMETER :: maxrecv = 12 ! Maximum number of fields to receive INTEGER, PARAMETER :: maxrecv_phys = 9 ! Maximum number of fields to receive in physiq (without fields received in INCA model ) ! will be changed in next version - INCA fields will be received in LMDZ (like for ORCHIDEE fields) @@ -118,5 +120,5 @@ USE carbon_cycle_mod, ONLY : carbon_cycle_cpl use wxios_mod, ONLY : wxios_context_init - USE chemistry_cycle_mod, ONLY : dms_cycle_cpl, n2o_cycle_cpl, ndp_cycle_cpl + USE chemistry_cycle_mod, ONLY : dms_cycle_cpl, n2o_cycle_cpl, ndp_cycle_cpl, nh3_cycle_cpl USE lmdz_xios USE print_control_mod, ONLY: lunout @@ -236,4 +238,7 @@ infosend(ids_atmndp)%action = .TRUE. ; infosend(ids_atmndp)%name = 'COATMNDP' ENDIF + IF (nh3_cycle_cpl) THEN + infosend(ids_atmnh3)%action = .TRUE. ; infosend(ids_atmnh3)%name = 'COATMNH3' + ENDIF infosend(ids_qraioc)%action = .TRUE. ; infosend(ids_qraioc)%name = 'COQRAIOC' infosend(ids_qsnooc)%action = .TRUE. ; infosend(ids_qsnooc)%name = 'COQSNOOC' @@ -281,5 +286,7 @@ inforecv(idr_ocen2o)%action = .TRUE. ; inforecv(idr_ocen2o)%name = 'SIN2OFLX' ENDIF - + IF (nh3_cycle_cpl) THEN + inforecv(idr_ocenh3)%action = .TRUE. ; inforecv(idr_ocenh3)%name = 'SINH3FLX' + ENDIF !************************************************************************************ @@ -402,6 +409,6 @@ IF (CPPKEY_INCA) THEN - IF (dms_cycle_cpl .OR. n2o_cycle_cpl .OR. ndp_cycle_cpl) THEN - CALL init_inca_oasis(inforecv(idr_ocedms:idr_ocen2o),infosend(ids_atmn2o:ids_atmndp)) + IF (dms_cycle_cpl .OR. n2o_cycle_cpl .OR. ndp_cycle_cpl .OR. nh3_cycle_cpl) THEN + CALL init_inca_oasis(inforecv(idr_ocedms:idr_ocenh3),infosend(ids_atmn2o:ids_atmnh3)) ENDIF END IF