Index: LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/carbon_cycle_mod.F90 =================================================================== --- LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/carbon_cycle_mod.F90 (revision 1443) +++ LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/carbon_cycle_mod.F90 (revision 1444) @@ -1,4 +1,9 @@ MODULE carbon_cycle_mod - +! Controle module for the carbon CO2 tracers : +! - Identification +! - Get concentrations comming from coupled model or read from file to tracers +! - Calculate new RCO2 for radiation scheme +! - Calculate new carbon flux for sending to coupled models (PISCES and ORCHIDEE) +! ! Author : Josefine GHATTAS, Patricia CADULE @@ -13,5 +18,10 @@ LOGICAL, PUBLIC :: carbon_cycle_cpl ! Coupling of CO2 fluxes between LMDZ/ORCHIDEE and LMDZ/OCEAN(PISCES) !$OMP THREADPRIVATE(carbon_cycle_cpl) + LOGICAL :: carbon_cycle_emis_comp=.FALSE. ! Calculation of emission compatible +!$OMP THREADPRIVATE(carbon_cycle_emis_comp) + + LOGICAL :: RCO2_inter ! RCO2 interactive : if true calculate new value RCO2 for the radiation scheme +!$OMP THREADPRIVATE(RCO2_inter) ! Scalare values when no transport, from physiq.def @@ -21,16 +31,14 @@ !$OMP THREADPRIVATE(emis_land_s) - INTEGER :: ntr_co2 ! Number of tracers concerning the carbon cycle - INTEGER :: id_fco2_tot ! Tracer index - INTEGER :: id_fco2_ocn ! - " - - INTEGER :: id_fco2_land ! - " - - INTEGER :: id_fco2_land_use ! - " - - INTEGER :: id_fco2_fos_fuel ! - " - -!$OMP THREADPRIVATE(ntr_co2, id_fco2_tot, id_fco2_ocn, id_fco2_land, id_fco2_land_use, id_fco2_fos_fuel) - - REAL, DIMENSION(:), ALLOCATABLE :: fos_fuel ! CO2 fossil fuel emission from file [gC/m2/d] -!$OMP THREADPRIVATE(fos_fuel) - REAL, DIMENSION(:), ALLOCATABLE, PUBLIC :: fco2_ocn_day ! flux CO2 from ocean for 1 day (cumulated) [gC/m2/d] + REAL :: airetot ! Total area of the earth surface +!$OMP THREADPRIVATE(airetot) + + INTEGER :: ntr_co2 ! Number of tracers concerning the carbon cycle +!$OMP THREADPRIVATE(ntr_co2) + +! fco2_ocn_day : flux CO2 from ocean for 1 day (cumulated) [gC/m2/d]. Allocation and initalization done in cpl_mod + REAL, DIMENSION(:), ALLOCATABLE, PUBLIC :: fco2_ocn_day !$OMP THREADPRIVATE(fco2_ocn_day) + REAL, DIMENSION(:), ALLOCATABLE :: fco2_land_day ! flux CO2 from land for 1 day (cumulated) [gC/m2/d] !$OMP THREADPRIVATE(fco2_land_day) @@ -38,5 +46,8 @@ !$OMP THREADPRIVATE(fco2_lu_day) -! Following 2 fields will be initialized in surf_land_orchidee at each time step + REAL, DIMENSION(:,:), ALLOCATABLE :: dtr_add ! Tracer concentration to be injected +!$OMP THREADPRIVATE(dtr_add) + +! Following 2 fields will be allocated and initialized in surf_land_orchidee REAL, DIMENSION(:), ALLOCATABLE, PUBLIC :: fco2_land_inst ! flux CO2 from land at one time step !$OMP THREADPRIVATE(fco2_land_inst) @@ -45,14 +56,37 @@ ! Calculated co2 field to be send to the ocean via the coupler and to ORCHIDEE - REAL, DIMENSION(:), ALLOCATABLE, PUBLIC :: co2_send + REAL, DIMENSION(:), ALLOCATABLE, PUBLIC :: co2_send ! Field allocated in phyetat0 !$OMP THREADPRIVATE(co2_send) + + + TYPE, PUBLIC :: co2_trac_type + CHARACTER(len = 8) :: name ! Tracer name in tracer.def + INTEGER :: id ! Index in total tracer list, tr_seri + CHARACTER(len=30) :: file ! File name + LOGICAL :: cpl ! True if this tracers is coupled from ORCHIDEE or PISCES. + ! False if read from file. + INTEGER :: updatefreq ! Frequence to inject in second + INTEGER :: readstep ! Actual time step to read in file + LOGICAL :: updatenow ! True if this tracer should be updated this time step + END TYPE co2_trac_type + INTEGER,PARAMETER :: maxco2trac=5 ! Maximum number of different CO2 fluxes + TYPE(co2_trac_type), DIMENSION(maxco2trac) :: co2trac CONTAINS - SUBROUTINE carbon_cycle_init(tr_seri, aerosol, radio) + SUBROUTINE carbon_cycle_init(tr_seri, pdtphys, aerosol, radio) +! This subroutine is called from traclmdz_init, only at first timestep. +! - Read controle parameters from .def input file +! - Search for carbon tracers and set default values +! - Allocate variables +! - Test for compatibility + USE dimphy + USE comgeomphy + USE mod_phys_lmdz_transfert_para USE infotrac USE IOIPSL USE surface_data, ONLY : ok_veget, type_ocean + USE phys_cal_mod, ONLY : mth_len IMPLICIT NONE @@ -62,4 +96,5 @@ ! Input argument REAL,DIMENSION(klon,klev,nbtr),INTENT(IN) :: tr_seri ! Concentration Traceur [U/KgA] + REAL,INTENT(IN) :: pdtphys ! length of time step in physiq (sec) ! InOutput arguments @@ -68,78 +103,13 @@ ! Local variables - INTEGER :: ierr, it, iiq - REAL, DIMENSION(klon) :: tr_seri_sum - - -! 0) Test for compatibility - IF (carbon_cycle_cpl .AND. type_ocean/='couple') & - CALL abort_gcm('carbon_cycle_init', 'Coupling with ocean model is needed for carbon_cycle_cpl',1) - IF (carbon_cycle_cpl .AND..NOT. ok_veget) & - CALL abort_gcm('carbon_cycle_init', 'Coupling with surface land model ORCHDIEE is needed for carbon_cycle_cpl',1) - - -! 1) Check if transport of one tracer flux CO2 or 4 separated tracers - IF (carbon_cycle_tr) THEN - id_fco2_tot=0 - id_fco2_ocn=0 - id_fco2_land=0 - id_fco2_land_use=0 - id_fco2_fos_fuel=0 - - ! Search in tracer list - DO it=1,nbtr - iiq=niadv(it+2) - IF (tname(iiq) == "fCO2" ) THEN - id_fco2_tot=it - ELSE IF (tname(iiq) == "fCO2_ocn" ) THEN - id_fco2_ocn=it - ELSE IF (tname(iiq) == "fCO2_land" ) THEN - id_fco2_land=it - ELSE IF (tname(iiq) == "fCO2_land_use" ) THEN - id_fco2_land_use=it - ELSE IF (tname(iiq) == "fCO2_fos_fuel" ) THEN - id_fco2_fos_fuel=it - END IF - END DO - - ! Count tracers found - IF (id_fco2_tot /= 0 .AND. & - id_fco2_ocn==0 .AND. id_fco2_land==0 .AND. id_fco2_land_use==0 .AND. id_fco2_fos_fuel==0) THEN - - ! transport 1 tracer flux CO2 - ntr_co2 = 1 - - ELSE IF (id_fco2_tot==0 .AND. & - id_fco2_ocn /=0 .AND. id_fco2_land/=0 .AND. id_fco2_land_use/=0 .AND. id_fco2_fos_fuel/=0) THEN - - ! transport 4 tracers seperatively - ntr_co2 = 4 - - ELSE - CALL abort_gcm('carbon_cycle_init', 'error in coherence between traceur.def and gcm.def',1) - END IF - - ! Definition of control varaiables for the tracers - DO it=1,nbtr - IF (it==id_fco2_tot .OR. it==id_fco2_ocn .OR. it==id_fco2_land .OR. & - it==id_fco2_land_use .OR. it==id_fco2_fos_fuel) THEN - aerosol(it) = .FALSE. - radio(it) = .FALSE. - END IF - END DO - - ELSE - ! No transport of CO2 - ntr_co2 = 0 - END IF ! carbon_cycle_tr - - -! 2) Allocate variable for CO2 fossil fuel emission - IF (carbon_cycle_tr) THEN - ! Allocate 2D variable - ALLOCATE(fos_fuel(klon), stat=ierr) - IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 1',1) - ELSE - ! No transport : read value from .def + INTEGER :: ierr, it, iiq, itc + INTEGER :: teststop + + + +! 1) Read controle parameters from .def input file +! ------------------------------------------------ + ! Read fosil fuel value if no transport + IF (.NOT. carbon_cycle_tr) THEN fos_fuel_s = 0. CALL getin ('carbon_cycle_fos_fuel',fos_fuel_s) @@ -148,68 +118,177 @@ -! 3) Allocate and initialize fluxes - IF (carbon_cycle_cpl) THEN - IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 2',1) - ALLOCATE(fco2_land_day(klon), stat=ierr) - IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 3',1) - ALLOCATE(fco2_lu_day(klon), stat=ierr) - IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 4',1) - - fco2_land_day(:) = 0. ! JG : Doit prend valeur de restart - fco2_lu_day(:) = 0. ! JG : Doit prend valeur de restart - - ! fco2_ocn_day is allocated in cpl_mod - ! fco2_land_inst and fco2_lu_inst are allocated in surf_land_orchidee - - ALLOCATE(co2_send(klon), stat=ierr) - IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 7',1) - - ! Calculate using restart tracer values - IF (carbon_cycle_tr) THEN - IF (ntr_co2==1) THEN - co2_send(:) = tr_seri(:,1,id_fco2_tot) + co2_ppm0 - ELSE ! ntr_co2==4 - ! Calculate the delta CO2 flux - tr_seri_sum(:) = tr_seri(:,1,id_fco2_fos_fuel) + tr_seri(:,1,id_fco2_land_use) + & - tr_seri(:,1,id_fco2_land) + tr_seri(:,1,id_fco2_ocn) - co2_send(:) = tr_seri_sum(:) + co2_ppm0 - END IF - ELSE - ! Send a scalare value in 2D variable to ocean and land model (PISCES and ORCHIDEE) - co2_send(:) = co2_ppm - END IF - - - ELSE - IF (carbon_cycle_tr) THEN - ! No coupling of CO2 fields : - ! corresponding fields will instead be read from files - ALLOCATE(fco2_ocn_day(klon), stat=ierr) - IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 8',1) - ALLOCATE(fco2_land_day(klon), stat=ierr) - IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 9',1) - ALLOCATE(fco2_lu_day(klon), stat=ierr) - IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 10',1) - END IF - END IF - -! 4) Read parmeter for calculation of emission compatible + ! Read parmeter for calculation compatible emission IF (.NOT. carbon_cycle_tr) THEN carbon_cycle_emis_comp=.FALSE. CALL getin('carbon_cycle_emis_comp',carbon_cycle_emis_comp) WRITE(lunout,*) 'carbon_cycle_emis_comp = ',carbon_cycle_emis_comp - END IF + IF (carbon_cycle_emis_comp) THEN + CALL abort_gcm('carbon_cycle_init', 'carbon_cycle_emis_comp option not yet implemented!!',1) + END IF + END IF + + ! Read parameter for interactive calculation of the CO2 value for the radiation scheme + RCO2_inter=.FALSE. + CALL getin('RCO2_inter',RCO2_inter) + WRITE(lunout,*) 'RCO2_inter = ', RCO2_inter + IF (RCO2_inter) THEN + WRITE(lunout,*) 'RCO2 will be recalculated once a day' + WRITE(lunout,*) 'RCO2 initial = ', RCO2 + END IF + + +! 2) Search for carbon tracers and set default values +! --------------------------------------------------- + itc=0 + DO it=1,nbtr + iiq=niadv(it+2) + + SELECT CASE(tname(iiq)) + CASE("fCO2_ocn") + itc = itc + 1 + co2trac(itc)%name='fCO2_ocn' + co2trac(itc)%id=it + co2trac(itc)%file='fl_co2_ocean.nc' + IF (carbon_cycle_cpl .AND. type_ocean=='couple') THEN + co2trac(itc)%cpl=.TRUE. + co2trac(itc)%updatefreq = 86400 ! Once a day as the coupling with OASIS/PISCES + ELSE + co2trac(itc)%cpl=.FALSE. + co2trac(itc)%updatefreq = 86400*mth_len ! Once a month + END IF + CASE("fCO2_land") + itc = itc + 1 + co2trac(itc)%name='fCO2_land' + co2trac(itc)%id=it + co2trac(itc)%file='fl_co2_land.nc' + IF (carbon_cycle_cpl .AND. ok_veget) THEN + co2trac(itc)%cpl=.TRUE. + co2trac(itc)%updatefreq = INT(pdtphys) ! Each timestep as the coupling with ORCHIDEE + ELSE + co2trac(itc)%cpl=.FALSE. +! co2trac(itc)%updatefreq = 10800 ! 10800sec = 3H + co2trac(itc)%updatefreq = 86400*mth_len ! Once a month + END IF + CASE("fCO2_land_use") + itc = itc + 1 + co2trac(itc)%name='fCO2_land_use' + co2trac(itc)%id=it + co2trac(itc)%file='fl_co2_land_use.nc' + IF (carbon_cycle_cpl .AND. ok_veget) THEN + co2trac(it)%cpl=.TRUE. + co2trac(itc)%updatefreq = INT(pdtphys) ! Each timestep as the coupling with ORCHIDEE + ELSE + co2trac(itc)%cpl=.FALSE. + co2trac(itc)%updatefreq = 10800 ! 10800sec = 3H + END IF + CASE("fCO2_fos_fuel") + itc = itc + 1 + co2trac(itc)%name='fCO2_fos_fuel' + co2trac(itc)%id=it + co2trac(itc)%file='fossil_fuel.nc' + co2trac(itc)%cpl=.FALSE. ! This tracer always read from file +! co2trac(itc)%updatefreq = 86400 ! 86400sec = 24H Cadule case + co2trac(itc)%updatefreq = 86400*mth_len ! Once a month + CASE("fCO2_bbg") + itc = itc + 1 + co2trac(itc)%name='fCO2_bbg' + co2trac(itc)%id=it + co2trac(itc)%file='fl_co2_bbg.nc' + co2trac(itc)%cpl=.FALSE. ! This tracer always read from file + co2trac(itc)%updatefreq = 86400*mth_len ! Once a month + CASE("fCO2") + ! fCO2 : One tracer transporting the total CO2 flux + itc = itc + 1 + co2trac(itc)%name='fCO2' + co2trac(itc)%id=it + co2trac(itc)%file='fl_co2.nc' + IF (carbon_cycle_cpl) THEN + co2trac(itc)%cpl=.TRUE. + ELSE + co2trac(itc)%cpl=.FALSE. + END IF + co2trac(itc)%updatefreq = 86400 + ! DOES THIS WORK ???? Problematic due to implementation of the coupled fluxes... + CALL abort_gcm('carbon_cycle_init','transport of total CO2 has to be implemented and tested',1) + END SELECT + END DO + + ! Total number of carbon CO2 tracers + ntr_co2 = itc + + ! Definition of control varaiables for the tracers + DO it=1,ntr_co2 + aerosol(co2trac(it)%id) = .FALSE. + radio(co2trac(it)%id) = .FALSE. + END DO + + ! Vector indicating which timestep to read for each tracer + ! Always start read in the beginning of the file + co2trac(:)%readstep = 0 + + +! 3) Allocate variables +! --------------------- + ! Allocate vector for storing fluxes to inject + ALLOCATE(dtr_add(klon,maxco2trac), stat=ierr) + IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 11',1) + + ! Allocate variables for cumulating fluxes from ORCHIDEE + IF (RCO2_inter) THEN + IF (.NOT. carbon_cycle_tr .AND. carbon_cycle_cpl) THEN + ALLOCATE(fco2_land_day(klon), stat=ierr) + IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 2',1) + fco2_land_day(1:klon) = 0. + + ALLOCATE(fco2_lu_day(klon), stat=ierr) + IF (ierr /= 0) CALL abort_gcm('carbon_cycle_init', 'pb in allocation 3',1) + fco2_lu_day(1:klon) = 0. + END IF + END IF + + +! 4) Test for compatibility +! ------------------------- +! IF (carbon_cycle_cpl .AND. type_ocean/='couple') THEN +! WRITE(lunout,*) 'Coupling with ocean model is needed for carbon_cycle_cpl' +! CALL abort_gcm('carbon_cycle_init', 'coupled ocean is needed for carbon_cycle_cpl',1) +! END IF +! +! IF (carbon_cycle_cpl .AND..NOT. ok_veget) THEN +! WRITE(lunout,*) 'Coupling with surface land model ORCHDIEE is needed for carbon_cycle_cpl' +! CALL abort_gcm('carbon_cycle_init', 'ok_veget is needed for carbon_cycle_cpl',1) +! END IF + + ! Compiler test : following should never happen + teststop=0 + DO it=1,teststop + CALL abort_gcm('carbon_cycle_init', 'Entering loop from 1 to 0',1) + END DO + + IF (ntr_co2==0) THEN + ! No carbon tracers found in tracer.def. It is not possible to do carbon cycle + WRITE(lunout,*) 'No carbon tracers found in tracer.def. Not ok with carbon_cycle_tr and/or carbon_cycle_cp' + CALL abort_gcm('carbon_cycle_init', 'No carbon tracers found in tracer.def',1) + END IF + +! 5) Calculate total area of the earth surface +! -------------------------------------------- + CALL reduce_sum(SUM(airephy),airetot) + CALL bcast(airetot) END SUBROUTINE carbon_cycle_init + + SUBROUTINE carbon_cycle(nstep, pdtphys, pctsrf, tr_seri, source) +! Subroutine for injection of co2 in the tracers ! -! -! - - SUBROUTINE carbon_cycle(nstep, pdtphys, pctsrf, tr_seri) - +! - Find out if it is time to update +! - Get tracer from coupled model or from file +! - Calculate new RCO2 value for the radiation scheme +! - Calculate CO2 flux to send to ocean and land models (PISCES and ORCHIDEE) + USE infotrac USE dimphy - USE mod_phys_lmdz_transfert_para, ONLY : reduce_sum + USE mod_phys_lmdz_transfert_para USE phys_cal_mod, ONLY : mth_cur, mth_len USE phys_cal_mod, ONLY : day_cur @@ -220,12 +299,16 @@ INCLUDE "clesphys.h" INCLUDE "indicesol.h" + INCLUDE "iniprint.h" + INCLUDE "YOMCST.h" ! In/Output arguments INTEGER,INTENT(IN) :: nstep ! time step in physiq REAL,INTENT(IN) :: pdtphys ! length of time step in physiq (sec) - REAL,DIMENSION(klon,nbsrf),INTENT(IN) :: pctsrf ! Pourcentage de sol f(nature du sol) - REAL, DIMENSION(klon,klev,nbtr), INTENT(INOUT) :: tr_seri + REAL,DIMENSION(klon,nbsrf),INTENT(IN) :: pctsrf ! Surface fraction + REAL, DIMENSION(klon,klev,nbtr), INTENT(INOUT) :: tr_seri ! All tracers + REAL, DIMENSION(klon,nbtr), INTENT(INOUT) :: source ! Source for all tracers ! Local variables + INTEGER :: it LOGICAL :: newmonth ! indicates if a new month just started LOGICAL :: newday ! indicates if a new day just started @@ -233,10 +316,11 @@ REAL, PARAMETER :: fact=1.E-15/2.12 ! transformation factor from gC/m2/day => ppm/m2/day - REAL, DIMENSION(klon) :: fco2_tmp, tr_seri_sum + REAL, DIMENSION(klon) :: fco2_tmp REAL :: sumtmp - REAL :: airetot ! Total area the earth REAL :: delta_co2_ppm -! -) Calculate logicals indicating if it is a new month, new day or the last time step in a day (end day) + +! 1) Calculate logicals indicating if it is a new month, new day or the last time step in a day (end day) +! ------------------------------------------------------------------------------------------------------- newday = .FALSE.; endday = .FALSE.; newmonth = .FALSE. @@ -245,152 +329,134 @@ IF (MOD(nstep,INT(86400./pdtphys))==0) endday=.TRUE. IF (newday .AND. day_cur==1) newmonth=.TRUE. - -! -) Read new maps if new month started - IF (newmonth .AND. carbon_cycle_tr) THEN - CALL read_map2D('fossil_fuel.nc','fos_fuel', mth_cur, .FALSE., fos_fuel) - - ! division by month lenght to get dayly value - fos_fuel(:) = fos_fuel(:)/mth_len - - IF (.NOT. carbon_cycle_cpl) THEN - ! Get dayly values from monthly fluxes - CALL read_map2D('fl_co2_ocean.nc','CO2_OCN',mth_cur,.FALSE.,fco2_ocn_day) - CALL read_map2D('fl_co2_land.nc','CO2_LAND', mth_cur,.FALSE.,fco2_land_day) - CALL read_map2D('fl_co2_land_use.nc','CO2_LAND_USE',mth_cur,.FALSE.,fco2_lu_day) - END IF - END IF - - - -! -) Update tracers at beginning of a new day. Beginning of a new day correspond to a new coupling period in cpl_mod. - IF (newday) THEN + +! 2) For each carbon tracer find out if it is time to inject (update) +! -------------------------------------------------------------------- + DO it = 1, ntr_co2 + IF ( MOD(nstep,INT(co2trac(it)%updatefreq/pdtphys)) == 1 ) THEN + co2trac(it)%updatenow = .TRUE. + ELSE + co2trac(it)%updatenow = .FALSE. + END IF + END DO + +! 3) Get tracer update +! -------------------------------------- + DO it = 1, ntr_co2 + IF ( co2trac(it)%updatenow ) THEN + IF ( co2trac(it)%cpl ) THEN + ! Get tracer from coupled model + SELECT CASE(co2trac(it)%name) + CASE('fCO2_land') ! from ORCHIDEE + dtr_add(:,it) = fco2_land_inst(:)*pctsrf(:,is_ter)*fact ! [ppm/m2/day] + CASE('fCO2_land_use') ! from ORCHIDEE + dtr_add(:,it) = fco2_lu_inst(:) *pctsrf(:,is_ter)*fact ! [ppm/m2/day] + CASE('fCO2_ocn') ! from PISCES + dtr_add(:,it) = fco2_ocn_day(:) *pctsrf(:,is_oce)*fact ! [ppm/m2/day] + CASE DEFAULT + WRITE(lunout,*) 'Error with tracer ',co2trac(it)%name + CALL abort_gcm('carbon_cycle', 'No coupling implemented for this tracer',1) + END SELECT + ELSE + ! Read tracer from file + co2trac(it)%readstep = co2trac(it)%readstep + 1 ! increment time step in file +! Patricia CALL read_map2D(co2trac(it)%file,'fco2',co2trac(it)%readstep,.FALSE.,dtr_add(:,it)) + CALL read_map2D(co2trac(it)%file,'fco2',co2trac(it)%readstep,.TRUE.,dtr_add(:,it)) + + ! Converte from kgC/m2/h to kgC/m2/s + dtr_add(:,it) = dtr_add(:,it)/3600 + ! Add individual treatment of values read from file + SELECT CASE(co2trac(it)%name) + CASE('fCO2_land') + dtr_add(:,it) = dtr_add(:,it) *pctsrf(:,is_ter) + CASE('fCO2_land_use') + dtr_add(:,it) = dtr_add(:,it) *pctsrf(:,is_ter) + CASE('fCO2_ocn') + dtr_add(:,it) = dtr_add(:,it) *pctsrf(:,is_oce) +! Patricia : +! CASE('fCO2_fos_fuel') +! dtr_add(:,it) = dtr_add(:,it)/mth_len +! co2trac(it)%readstep = 0 ! Always read same value for fossil fuel(Cadule case) + END SELECT + END IF + END IF + END DO + +! 4) Update co2 tracers : +! Loop over all carbon tracers and add source +! ------------------------------------------------------------------ + IF (carbon_cycle_tr) THEN + DO it = 1, ntr_co2 + IF (.FALSE.) THEN + tr_seri(1:klon,1,co2trac(it)%id) = tr_seri(1:klon,1,co2trac(it)%id) + dtr_add(1:klon,it) + source(1:klon,co2trac(it)%id) = 0. + ELSE + source(1:klon,co2trac(it)%id) = dtr_add(1:klon,it) + END IF + END DO + END IF + + +! 5) Calculations for new CO2 value for the radiation scheme(instead of reading value from .def) +! ---------------------------------------------------------------------------------------------- + IF (RCO2_inter) THEN + ! Cumulate fluxes from ORCHIDEE at each timestep + IF (.NOT. carbon_cycle_tr .AND. carbon_cycle_cpl) THEN + IF (newday) THEN ! Reset cumulative variables once a day + fco2_land_day(1:klon) = 0. + fco2_lu_day(1:klon) = 0. + END IF + fco2_land_day(1:klon) = fco2_land_day(1:klon) + fco2_land_inst(1:klon) ![gC/m2/day] + fco2_lu_day(1:klon) = fco2_lu_day(1:klon) + fco2_lu_inst(1:klon) ![gC/m2/day] + END IF + + ! At the end of a new day, calculate a mean scalare value of CO2 + ! JG : Ici on utilise uniquement le traceur du premier couche du modele. Est-ce que c'est correcte ? + IF (endday) THEN + + IF (carbon_cycle_tr) THEN + ! Sum all co2 tracers to get the total delta CO2 flux + fco2_tmp(:) = 0. + DO it = 1, ntr_co2 + fco2_tmp(1:klon) = fco2_tmp(1:klon) + tr_seri(1:klon,1,co2trac(it)%id) + END DO + + ELSE IF (carbon_cycle_cpl) THEN ! no carbon_cycle_tr + ! Sum co2 fluxes comming from coupled models and parameter for fossil fuel + fco2_tmp(1:klon) = fos_fuel_s + ((fco2_lu_day(1:klon) + fco2_land_day(1:klon))*pctsrf(1:klon,is_ter) & + + fco2_ocn_day(:)*pctsrf(:,is_oce)) * fact + END IF + + ! Calculate a global mean value of delta CO2 flux + fco2_tmp(1:klon) = fco2_tmp(1:klon) * airephy(1:klon) + CALL reduce_sum(SUM(fco2_tmp),sumtmp) + CALL bcast(sumtmp) + delta_co2_ppm = sumtmp/airetot + + ! Add initial value for co2_ppm and delta value + co2_ppm = co2_ppm0 + delta_co2_ppm + + ! Transformation of atmospheric CO2 concentration for the radiation code + RCO2 = co2_ppm * 1.0e-06 * 44.011/28.97 + + WRITE(lunout,*) 'RCO2 is now updated! RCO2 = ', RCO2 + END IF ! endday + + END IF ! RCO2_inter + + +! 6) Calculate CO2 flux to send to ocean and land models : PISCES and ORCHIDEE +! ---------------------------------------------------------------------------- + IF (carbon_cycle_cpl) THEN IF (carbon_cycle_tr) THEN - - ! Update tracers - IF (ntr_co2 == 1) THEN - ! Calculate the new flux CO2 - tr_seri(:,1,id_fco2_tot) = tr_seri(:,1,id_fco2_tot) + & - (fos_fuel(:) + & - fco2_lu_day(:) * pctsrf(:,is_ter) + & - fco2_land_day(:)* pctsrf(:,is_ter) + & - fco2_ocn_day(:) * pctsrf(:,is_oce)) * fact - - ELSE ! ntr_co2 == 4 - tr_seri(:,1,id_fco2_fos_fuel) = tr_seri(:,1,id_fco2_fos_fuel) + fos_fuel(:) * fact ! [ppm/m2/day] - - tr_seri(:,1,id_fco2_land_use) = tr_seri(:,1,id_fco2_land_use) + & - fco2_lu_day(:) *pctsrf(:,is_ter)*fact ! [ppm/m2/day] - - tr_seri(:,1,id_fco2_land) = tr_seri(:,1,id_fco2_land) + & - fco2_land_day(:)*pctsrf(:,is_ter)*fact ! [ppm/m2/day] - - tr_seri(:,1,id_fco2_ocn) = tr_seri(:,1,id_fco2_ocn) + & - fco2_ocn_day(:) *pctsrf(:,is_oce)*fact ! [ppm/m2/day] - - END IF - - ELSE ! no transport - IF (carbon_cycle_cpl) THEN - IF (carbon_cycle_emis_comp) THEN - ! Calcul emission compatible a partir des champs 2D et co2_ppm - !!! TO DO!! - CALL abort_gcm('carbon_cycle', ' Option carbon_cycle_emis_comp not yet implemented',1) - END IF - END IF - - END IF ! carbon_cycle_tr - - ! Reset cumluative variables - IF (carbon_cycle_cpl) THEN - fco2_land_day(:) = 0. - fco2_lu_day(:) = 0. - END IF - - END IF ! newday - - - -! -) Cumulate fluxes from ORCHIDEE at each timestep - IF (carbon_cycle_cpl) THEN - fco2_land_day(:) = fco2_land_day(:) + fco2_land_inst(:) - fco2_lu_day(:) = fco2_lu_day(:) + fco2_lu_inst(:) - END IF - - - -! -) At the end of a new day, calculate a mean scalare value of CO2 to be used by -! the radiation scheme (instead of reading value from .def) - -! JG : Ici on utilise uniquement le traceur du premier couche du modele. Est-ce que c'est correcte ? - IF (endday) THEN - ! Calculte total area of the earth surface - CALL reduce_sum(SUM(airephy),airetot) - - - IF (carbon_cycle_tr) THEN - IF (ntr_co2 == 1) THEN - - ! Calculate mean value of tracer CO2 to get an scalare value to be used in the - ! radiation scheme (instead of reading value from .def) - ! Mean value weighted with the grid cell area - - ! Calculate mean value - fco2_tmp(:) = tr_seri(:,1,id_fco2_tot) * airephy(:) - CALL reduce_sum(SUM(fco2_tmp),sumtmp) - co2_ppm = sumtmp/airetot + co2_ppm0 - - ELSE ! ntr_co2 == 4 - - ! Calculate the delta CO2 flux - tr_seri_sum(:) = tr_seri(:,1,id_fco2_fos_fuel) + tr_seri(:,1,id_fco2_land_use) + & - tr_seri(:,1,id_fco2_land) + tr_seri(:,1,id_fco2_ocn) - - ! Calculate mean value of delta CO2 flux - fco2_tmp(:) = tr_seri_sum(:) * airephy(:) - CALL reduce_sum(SUM(fco2_tmp),sumtmp) - delta_co2_ppm = sumtmp/airetot - - ! Add initial value for co2_ppm to delta value - co2_ppm = delta_co2_ppm + co2_ppm0 - END IF - - ELSE IF (carbon_cycle_cpl) THEN ! no carbon_cycle_tr - - ! Calculate the total CO2 flux and integrate to get scalare value for the radiation scheme - fco2_tmp(:) = (fos_fuel(:) + (fco2_lu_day(:) + fco2_land_day(:))*pctsrf(:,is_ter) & - + fco2_ocn_day(:)*pctsrf(:,is_oce)) * fact - - ! Calculate mean value - fco2_tmp(:) = fco2_tmp(:) * airephy(:) - CALL reduce_sum(SUM(fco2_tmp),sumtmp) - delta_co2_ppm = sumtmp/airetot - - ! Update current value of the atmospheric co2_ppm - co2_ppm = co2_ppm + delta_co2_ppm - - END IF ! carbon_cycle_tr - - ! transformation of the atmospheric CO2 concentration for the radiation code - RCO2 = co2_ppm * 1.0e-06 * 44.011/28.97 - - END IF - - ! Calculate CO2 flux to send to ocean and land models : PISCES and ORCHIDEE - IF (endday .AND. carbon_cycle_cpl) THEN - - IF (carbon_cycle_tr) THEN - IF (ntr_co2==1) THEN - - co2_send(:) = tr_seri(:,1,id_fco2_tot) + co2_ppm0 - - ELSE ! ntr_co2 == 4 - - co2_send(:) = tr_seri_sum(:) + co2_ppm0 - - END IF + ! Sum all co2 tracers to get the total delta CO2 flux at first model layer + fco2_tmp(:) = 0. + DO it = 1, ntr_co2 + fco2_tmp(1:klon) = fco2_tmp(1:klon) + tr_seri(1:klon,1,co2trac(it)%id) + END DO + co2_send(1:klon) = fco2_tmp(1:klon) + co2_ppm0 ELSE ! Send a scalare value in 2D variable to ocean and land model (PISCES and ORCHIDEE) - co2_send(:) = co2_ppm + co2_send(1:klon) = co2_ppm END IF Index: LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/cpl_mod.F90 =================================================================== --- LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/cpl_mod.F90 (revision 1443) +++ LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/cpl_mod.F90 (revision 1444) @@ -100,4 +100,5 @@ SUBROUTINE cpl_init(dtime, rlon, rlat) USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, fco2_ocn_day + USE surface_data INCLUDE "dimensions.h" @@ -270,4 +271,14 @@ ENDIF ! is_sequential + +!************************************************************************************* +! compatibility test +! +!************************************************************************************* + IF (carbon_cycle_cpl .AND. version_ocean=='opa8') THEN + abort_message='carbon_cycle_cpl does not work with opa8' + CALL abort_gcm(modname,abort_message,1) + END IF + END SUBROUTINE cpl_init Index: LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/phyetat0.F =================================================================== --- LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/phyetat0.F (revision 1443) +++ LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/phyetat0.F (revision 1444) @@ -21,5 +21,6 @@ USE infotrac USE traclmdz_mod, ONLY : traclmdz_from_restart - USE carbon_cycle_mod,ONLY : carbon_cycle_tr, carbon_cycle_cpl + USE carbon_cycle_mod,ONLY : + & carbon_cycle_tr, carbon_cycle_cpl, co2_send IMPLICIT none @@ -1078,6 +1079,17 @@ END DO - CALL traclmdz_from_restart(trs) + + IF (carbon_cycle_cpl) THEN + ALLOCATE(co2_send(klon), stat=ierr) + IF (ierr /= 0) CALL abort_gcm + & ('phyetat0','pb allocation co2_send',1) + CALL get_field("co2_send",co2_send,found) + IF (.NOT. found) THEN + PRINT*,"phyetat0: Le champ est absent" + PRINT*,"Initialisation uniforme a co2_ppm=",co2_ppm + co2_send(:) = co2_ppm + END IF + END IF END IF Index: LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/phyredem.F =================================================================== --- LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/phyredem.F (revision 1443) +++ LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/phyredem.F (revision 1444) @@ -15,5 +15,5 @@ USE infotrac USE control_mod - + USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send IMPLICIT none @@ -337,4 +337,12 @@ CALL put_field("trs_"//tname(iiq),"",trs(:,it)) END DO + IF (carbon_cycle_cpl) THEN + IF (.NOT. ALLOCATED(co2_send)) THEN + ! This is the case of create_etat0_limit, ce0l + ALLOCATE(co2_send(klon)) + co2_send(:) = co2_ppm0 + END IF + CALL put_field("co2_send","co2_ppm for coupling",co2_send) + END IF END IF Index: LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/phytrac.F90 =================================================================== --- LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/phytrac.F90 (revision 1443) +++ LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/phytrac.F90 (revision 1444) @@ -214,5 +214,5 @@ CASE('lmdz') !IM ajout t_seri, pplay, sh CALL traclmdz_init(pctsrf, ftsol, tr_seri, aerosol, lessivage) - CALL traclmdz_init(pctsrf, ftsol, tr_seri, t_seri, pplay, sh, aerosol, lessivage) + CALL traclmdz_init(pctsrf, ftsol, tr_seri, t_seri, pplay, sh, pdtphys, aerosol, lessivage) CASE('inca') source(:,:)=0. Index: LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/read_map2D.F90 =================================================================== --- LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/read_map2D.F90 (revision 1443) +++ LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/read_map2D.F90 (revision 1444) @@ -11,6 +11,6 @@ ! Input arguments - CHARACTER(len=20), INTENT(IN) :: filename ! name of file to read - CHARACTER(len=20), INTENT(IN) :: varname ! name of variable in file + CHARACTER(len=*), INTENT(IN) :: filename ! name of file to read + CHARACTER(len=*), INTENT(IN) :: varname ! name of variable in file INTEGER, INTENT(IN) :: timestep ! actual timestep LOGICAL, INTENT(IN) :: inverse ! TRUE if latitude needs to be inversed @@ -27,18 +27,21 @@ REAL, DIMENSION(nbp_lon,nbp_lat) :: var_glo2D_tmp ! 2D global REAL, DIMENSION(klon_glo) :: var_glo1D ! 1D global - + INCLUDE "iniprint.h" ! Read variable from file. Done by master process MPI and master thread OpenMP IF (is_mpi_root .AND. is_omp_root) THEN - ierr = NF90_OPEN (filename, NF90_NOWRITE, nid) - IF (ierr /= NF90_NOERR) CALL abort_gcm(modname,'Problem in opening file '//filename,1) + ierr = NF90_OPEN(trim(filename), NF90_NOWRITE, nid) + IF (ierr /= NF90_NOERR) CALL write_err_mess('Problem in opening file') - ierr = NF90_INQ_VARID(nid, varname, nvarid) - IF (ierr /= NF90_NOERR) CALL abort_gcm(modname, 'The variable '//varname//' is absent in file',1) + ierr = NF90_INQ_VARID(nid, trim(varname), nvarid) + IF (ierr /= NF90_NOERR) CALL write_err_mess('The variable is absent in file') start=(/1,1,timestep/) count=(/nbp_lon,nbp_lat,1/) ierr = NF90_GET_VAR(nid, nvarid, var_glo2D,start,count) - IF (ierr /= NF90_NOERR) CALL abort_gcm(modname, 'Problem in reading varaiable '//varname,1) + IF (ierr /= NF90_NOERR) CALL write_err_mess('Problem in reading varaiable') + + ierr = NF90_CLOSE(nid) + IF (ierr /= NF90_NOERR) CALL write_err_mess('Problem in closing file') ! Inverse latitude order @@ -53,4 +56,8 @@ CALL grid2Dto1D_glo(var_glo2D,var_glo1D) + WRITE(lunout,*) 'in read_map2D, filename = ', trim(filename) + WRITE(lunout,*) 'in read_map2D, varname = ', trim(varname) + WRITE(lunout,*) 'in read_map2D, timestep = ', timestep + CALL flush(lunout) ENDIF @@ -58,3 +65,17 @@ CALL scatter(var_glo1D, varout) + CONTAINS + SUBROUTINE write_err_mess(err_mess) + + CHARACTER(len=*), INTENT(IN) :: err_mess + INCLUDE "iniprint.h" + + WRITE(lunout,*) 'Error in read_map2D, filename = ', trim(filename) + WRITE(lunout,*) 'Error in read_map2D, varname = ', trim(varname) + WRITE(lunout,*) 'Error in read_map2D, timestep = ', timestep + + CALL abort_gcm(modname, err_mess, 1) + + END SUBROUTINE write_err_mess + END SUBROUTINE read_map2D Index: LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/surf_land_orchidee_mod.F90 =================================================================== --- LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/surf_land_orchidee_mod.F90 (revision 1443) +++ LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/surf_land_orchidee_mod.F90 (revision 1444) @@ -43,6 +43,5 @@ USE mod_surf_para USE mod_synchro_omp - -USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, fco2_land_inst, fco2_lu_inst + USE carbon_cycle_mod, ONLY : carbon_cycle_cpl ! @@ -138,6 +137,4 @@ INTEGER :: error REAL, DIMENSION(klon) :: swdown_vrai - REAL, DIMENSION(klon) :: fco2_land_comp ! sur grille compresse - REAL, DIMENSION(klon) :: fco2_lu_comp ! sur grille compresse CHARACTER (len = 20) :: modname = 'surf_land_orchidee' CHARACTER (len = 80) :: abort_message @@ -348,14 +345,9 @@ ENDIF ! -! Allocate variables needed for carbon_cycle_mod +! carbon_cycle_cpl not possible with this interface and version of ORHCHIDEE ! IF (carbon_cycle_cpl) THEN - IF (.NOT. ALLOCATED(fco2_land_inst)) THEN - ALLOCATE(fco2_land_inst(klon),stat=error) - IF (error /= 0) CALL abort_gcm(modname,'Pb in allocation fco2_land_inst',1) - - ALLOCATE(fco2_lu_inst(klon),stat=error) - IF(error /=0) CALL abort_gcm(modname,'Pb in allocation fco2_lu_inst',1) - END IF + abort_message='carbon_cycle_cpl not yet possible with this interface of ORCHIDEE' + CALL abort_gcm(modname,abort_message,1) END IF @@ -464,22 +456,4 @@ -! JG : TEMPORAIRE!!!! Les variables fco2_land_comp et fco2_lu_comp seront plus tard en sortie d'ORCHIDEE -! ici mis a valeur quelquonque pour test. Ces variables sont sur la grille compresse avec uniquement des points de terres - - fco2_land_comp(:) = 1. - fco2_lu_comp(:) = 10. - -! Decompress variables for the module carbon_cycle_mod - IF (carbon_cycle_cpl) THEN - fco2_land_inst(:)=0. - fco2_lu_inst(:)=0. - - DO igrid = 1, knon - ireal = knindex(igrid) - fco2_land_inst(ireal) = fco2_land_comp(igrid) - fco2_lu_inst(ireal) = fco2_lu_comp(igrid) - END DO - END IF - END SUBROUTINE surf_land_orchidee ! Index: LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90 =================================================================== --- LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90 (revision 1443) +++ LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90 (revision 1444) @@ -138,7 +138,7 @@ INTEGER :: ij, jj, igrid, ireal, index INTEGER :: error + INTEGER, SAVE :: nb_fields_cpl ! number of fields for the climate-carbon coupling (between ATM and ORCHIDEE). + REAL, SAVE, ALLOCATABLE, DIMENSION(:,:) :: fields_cpl ! Fluxes for the climate-carbon coupling REAL, DIMENSION(klon) :: swdown_vrai - REAL, DIMENSION(klon) :: fco2_land_comp ! sur grille compresse - REAL, DIMENSION(klon) :: fco2_lu_comp ! sur grille compresse CHARACTER (len = 20) :: modname = 'surf_land_orchidee' CHARACTER (len = 80) :: abort_message @@ -210,4 +210,12 @@ IF (debut) THEN +! Test de coherence +#ifndef ORCH_NEW + ! Compilation avec orchidee nouvelle version necessaire avec carbon_cycle_cpl=y + IF (carbon_cycle_cpl) THEN + abort_message='You must define preprossing key ORCH_NEW when running carbon_cycle_cpl=y' + CALL abort_gcm(modname,abort_message,1) + END IF +#endif ALLOCATE(ktindex(knon)) IF ( .NOT. ALLOCATED(albedo_keep)) THEN @@ -342,14 +350,21 @@ ! ! Allocate variables needed for carbon_cycle_mod -! + IF ( carbon_cycle_cpl ) THEN + nb_fields_cpl=2 + ELSE + nb_fields_cpl=1 + END IF + + IF (carbon_cycle_cpl) THEN - IF (.NOT. ALLOCATED(fco2_land_inst)) THEN - ALLOCATE(fco2_land_inst(klon),stat=error) - IF (error /= 0) CALL abort_gcm(modname,'Pb in allocation fco2_land_inst',1) - - ALLOCATE(fco2_lu_inst(klon),stat=error) - IF(error /=0) CALL abort_gcm(modname,'Pb in allocation fco2_lu_inst',1) - END IF + ALLOCATE(fco2_land_inst(klon),stat=error) + IF (error /= 0) CALL abort_gcm(modname,'Pb in allocation fco2_land_inst',1) + + ALLOCATE(fco2_lu_inst(klon),stat=error) + IF(error /=0) CALL abort_gcm(modname,'Pb in allocation fco2_lu_inst',1) END IF + + ALLOCATE(fields_cpl(klon,nb_fields_cpl), stat = error) + IF (error /= 0) CALL abort_gcm(modname,'Pb in allocation fields_cpl',1) ENDIF ! (fin debut) @@ -406,8 +421,13 @@ evap, fluxsens, fluxlat, coastalflow, riverflow, & tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, & - lon_scat, lat_scat, q2m, t2m) + lon_scat, lat_scat, q2m, t2m & +#ifdef ORCH_NEW + , nb_fields_cpl, fields_cpl) +#else + ) +#endif #else - ! Interface for ORCHIDEE version 1.9 or later(1.9.2, 1.9.3, 1.9.4) compiled in parallel mode(with preprocessing flag CPP_MPI) + ! Interface for ORCHIDEE version 1.9 or later(1.9.2, 1.9.3, 1.9.4, 1.9.5) compiled in parallel mode(with preprocessing flag CPP_MPI) CALL intersurf_main (itime+itau_phy-1, iim, jjm+1, offset, knon, ktindex, & orch_comm, dtime, lrestart_read, lrestart_write, lalo, & @@ -418,5 +438,10 @@ evap(1:knon), fluxsens(1:knon), fluxlat(1:knon), coastalflow(1:knon), riverflow(1:knon), & tsol_rad(1:knon), tsurf_new(1:knon), qsurf(1:knon), albedo_out(1:knon,:), emis_new(1:knon), z0_new(1:knon), & - lon_scat, lat_scat, q2m, t2m) + lon_scat, lat_scat, q2m, t2m & +#ifdef ORCH_NEW + , nb_fields_cpl, fields_cpl(1:knon,:)) +#else + ) +#endif #endif @@ -431,5 +456,4 @@ IF (knon /=0) THEN - #ifndef CPP_MPI ! Interface for ORCHIDEE compiled in sequential mode(without preprocessing flag CPP_MPI) @@ -442,6 +466,10 @@ evap, fluxsens, fluxlat, coastalflow, riverflow, & tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, & - lon_scat, lat_scat, q2m, t2m) - + lon_scat, lat_scat, q2m, t2m & +#ifdef ORCH_NEW + , nb_fields_cpl, fields_cpl) +#else + ) +#endif #else ! Interface for ORCHIDEE version 1.9 or later compiled in parallel mode(with preprocessing flag CPP_MPI) @@ -454,7 +482,11 @@ evap(1:knon), fluxsens(1:knon), fluxlat(1:knon), coastalflow(1:knon), riverflow(1:knon), & tsol_rad(1:knon), tsurf_new(1:knon), qsurf(1:knon), albedo_out(1:knon,:), emis_new(1:knon), z0_new(1:knon), & - lon_scat, lat_scat, q2m, t2m) -#endif - + lon_scat, lat_scat, q2m, t2m & +#ifdef ORCH_NEW + , nb_fields_cpl, fields_cpl(1:knon,:)) +#else + ) +#endif +#endif ENDIF @@ -478,11 +510,4 @@ IF (debut) lrestart_read = .FALSE. - - -! JG : TEMPORAIRE!!!! Les variables fco2_land_comp et fco2_lu_comp seront plus tard en sortie d'ORCHIDEE -! ici mis a valeur quelquonque pour test. Ces variables sont sur la grille compresse avec uniquement des points de terres - - fco2_land_comp(:) = 1. - fco2_lu_comp(:) = 10. ! Decompress variables for the module carbon_cycle_mod @@ -493,6 +518,6 @@ DO igrid = 1, knon ireal = knindex(igrid) - fco2_land_inst(ireal) = fco2_land_comp(igrid) - fco2_lu_inst(ireal) = fco2_lu_comp(igrid) + fco2_land_inst(ireal) = fields_cpl(igrid,1) + fco2_lu_inst(ireal) = fields_cpl(igrid,2) END DO END IF Index: LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/traclmdz_mod.F90 =================================================================== --- LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/traclmdz_mod.F90 (revision 1443) +++ LMDZ5/branches/LMDZ5V1.0-dev/libf/phylmd/traclmdz_mod.F90 (revision 1444) @@ -84,5 +84,5 @@ - SUBROUTINE traclmdz_init(pctsrf, ftsol, tr_seri, t_seri, pplay, sh, aerosol, lessivage) + SUBROUTINE traclmdz_init(pctsrf, ftsol, tr_seri, t_seri, pplay, sh, pdtphys, aerosol, lessivage) ! This subroutine allocates and initialize module variables and control variables. ! Initialization of the tracers should be done here only for those not found in the restart file. @@ -104,4 +104,5 @@ REAL,DIMENSION(klon,klev),INTENT(IN) :: pplay ! pression pour le mileu de chaque couche (en Pa) REAL,DIMENSION(klon,klev),INTENT(IN) :: sh ! humidite specifique + REAL,INTENT(IN) :: pdtphys ! Pas d'integration pour la physique (seconde) ! Output variables @@ -226,5 +227,5 @@ ! ---------------------------------------------- IF (carbon_cycle_tr .OR. carbon_cycle_cpl) THEN - CALL carbon_cycle_init(tr_seri, aerosol, radio) + CALL carbon_cycle_init(tr_seri, pdtphys, aerosol, radio) END IF @@ -546,5 +547,5 @@ !====================================================================== IF (carbon_cycle_tr .OR. carbon_cycle_cpl) THEN - CALL carbon_cycle(nstep, pdtphys, pctsrf, tr_seri) + CALL carbon_cycle(nstep, pdtphys, pctsrf, tr_seri, source) END IF