Changeset 7265 for branches


Ignore:
Timestamp:
2021-07-30T18:36:29+02:00 (3 years ago)
Author:
agnes.ducharne
Message:

Integrated r5705 (solay now in meters in output files), and small changes with no impact on code (r6220, r6565, r6567) from the trunk. Checked with a 5d run.

Location:
branches/ORCHIDEE_2_2/ORCHIDEE
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_driver/orchideedriver.f90

    r7262 r7265  
    578578  CALL xios_orchidee_init( MPI_COMM_ORCH,                & 
    579579       date0,    year_end, month_end, day_end, julian_diff,  & 
    580        lon,      lat,      znt) 
     580       lon,      lat ) 
    581581  CALL sechiba_xios_initialize  
    582582 
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_oasisdriver/orchideeoasis.f90

    r6319 r7265  
    435435  CALL xios_orchidee_init( MPI_COMM_ORCH,                    & 
    436436       date0,    year,    month,           day, julian_diff, & 
    437        lon,      lat,     soilth_lev) 
     437       lon,      lat ) 
    438438  ! 
    439439  itau_sechiba = itau + itau_offset 
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/xios_orchidee.f90

    r7255 r7265  
    126126  SUBROUTINE xios_orchidee_init(MPI_COMM_ORCH,                   & 
    127127       date0,    year,      month,             day, julian_diff, & 
    128        lon_mpi,  lat_mpi,   soilth_lev ) 
     128       lon_mpi,  lat_mpi ) 
    129129 
    130130    USE grid, ONLY : grid_type, unstructured, regular_lonlat, regular_xy, nvertex, & 
    131131                     longitude, latitude, bounds_lon, bounds_lat, ind_cell_glo 
     132 
     133    USE vertical_soil_var, ONLY : znt, znh 
     134 
    132135    IMPLICIT NONE 
    133136    ! 
     
    141144    REAL(r_std), INTENT(in)                               :: julian_diff      !! Current day in the year [1,365(366)] 
    142145    REAL(r_std),DIMENSION (iim_g,jj_nb), INTENT(in)       :: lon_mpi, lat_mpi !! Longitudes and latitudes on MPI local domain 2D domain 
    143     REAL(r_std),DIMENSION (ngrnd), INTENT(in)             :: soilth_lev       !! Vertical soil levels for thermal scheme (m) 
    144146    ! 
    145147    !! 0.2 Local variables 
     
    357359       CALL xios_set_axis_attr("nparts",n_glo=nparts,VALUE=(/(REAL(i,r_std),i=1,nparts)/)) 
    358360       CALL xios_set_axis_attr("nlaip1", n_glo=nlai+1,VALUE=(/(REAL(i,r_std),i=1,nlai+1)/)) 
    359        CALL xios_set_axis_attr("ngrnd",n_glo=ngrnd ,VALUE=soilth_lev(:)) 
     361       CALL xios_set_axis_attr("ngrnd",n_glo=ngrnd ,VALUE=znt(:)) 
    360362       CALL xios_set_axis_attr("nstm", n_glo=nstm,VALUE=(/(REAL(i,r_std),i=1,nstm)/)) 
    361363       CALL xios_set_axis_attr("ncsm", n_glo=nscm,VALUE=(/(REAL(i,r_std),i=1,nscm)/)) 
    362364       CALL xios_set_axis_attr("nnobio", n_glo=nnobio,VALUE=(/(REAL(i,r_std),i=1,nnobio)/)) 
    363365       CALL xios_set_axis_attr("albtyp", n_glo=2,VALUE=(/(REAL(i,r_std),i=1,2)/)) 
    364        CALL xios_set_axis_attr("nslm", n_glo=nslm,VALUE=(/(REAL(i,r_std),i=1,nslm)/)) 
     366       CALL xios_set_axis_attr("nslm", n_glo=nslm,VALUE=znh(:)) 
    365367       CALL xios_set_axis_attr("P10", n_glo=10,VALUE=(/(REAL(i,r_std), i=1,10)/)) 
    366368       CALL xios_set_axis_attr("P100", n_glo=100,VALUE=(/(REAL(i,r_std), i=1,100)/)) 
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/diffuco.f90

    r7251 r7265  
    288288    REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (in)  :: qsintmax         !! Maximum water on vegetation for interception  
    289289                                                                           !! (kg m^{-2}) 
    290     REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (in)  :: co2_to_bm        !! virtual gpp ((gC m^{-2} s^{-1}), total area)  
     290    REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (in)  :: co2_to_bm        !! virtual gpp ((gC m^{-2} dt_sechiba^{-1}), total area)  
    291291    REAL(r_std),DIMENSION (kjpindex,nvm,npco2), INTENT (in) :: assim_param !! min+max+opt temps, vcmax, vjmax 
    292292                                                                           !! for photosynthesis (K ??) 
     
    315315    REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (out) :: rstruct          !! Structural resistance for the vegetation 
    316316    REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (out) :: cimean           !! Mean leaf Ci (ppm)   
    317     REAL(r_std),DIMENSION (kjpindex,nvm), INTENT(out)  :: gpp              !! Assimilation ((gC m^{-2} s^{-1}), total area)   
     317    REAL(r_std),DIMENSION (kjpindex,nvm), INTENT(out)  :: gpp              !! Assimilation ((gC m^{-2} dt_sechiba^{-1}), total area)   
    318318 
    319319    !! 0.3 Modified variables 
     
    14251425    REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (in)        :: vbeta23          !! Beta for fraction of wetted foliage that will  
    14261426                                                                                 !! transpire (unitless)  
    1427     REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (in)        :: co2_to_bm        !! virtual gpp ((gC m^{-2} s^{-1}), total area) 
     1427    REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (in)        :: co2_to_bm        !! virtual gpp ((gC m^{-2} dt_sechiba ^{-1}), total area) 
    14281428    INTEGER(i_std),INTENT (in)                               :: hist_id          !! _History_ file identifier (-)     
    14291429    INTEGER(i_std),DIMENSION (kjpindex*nvm), INTENT (in) :: indexveg       !! Indeces of the points on the 3D map (-)    
     
    14421442                                                                                 !! @tex ($\mu mol mol^{-1}$) @endtex 
    14431443    REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (out)       :: gsmean           !! mean stomatal conductance to CO2 (umol m-2 s-1) 
    1444     REAL(r_Std),DIMENSION (kjpindex,nvm), INTENT (out)       :: gpp 
    1445  !! Assimilation ((gC m^{-2} s^{-1}), total area) 
     1444    REAL(r_Std),DIMENSION (kjpindex,nvm), INTENT (out)       :: gpp              !! Assimilation ((gC m^{-2} dt_sechiba^{-1}), total area) 
    14461445    REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (out)       :: cim              !! Intercellular CO2 over nlai  
    14471446    ! 
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/enerbil.f90

    r7084 r7265  
    9898  REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:)    :: q_sol_pot               !! Potential surface humidity 
    9999!$OMP THREADPRIVATE(q_sol_pot) 
    100   REAL(r_std), ALLOCATABLE, SAVE, DIMENSION (:)    :: temp_sol_pot            !! Potential surface temperature (unstressed) 
    101 !$OMP THREADPRIVATE(temp_sol_pot) 
    102100 
    103101   
     
    195193    IF (ier /= 0) CALL ipslerr_p(3,'enerbil_initialize','Problem in allocation of variable q_sol_pot','','') 
    196194 
    197     ALLOCATE (temp_sol_pot(kjpindex),stat=ier) 
    198     IF (ier /= 0) CALL ipslerr_p(3,'enerbil_initialize','Problem in allocation of variable temp_sol_pot','','') 
    199195 
    200196    !! 2. Initialize variables from restart file or by default values 
     
    276272    ENDIF 
    277273     
    278     CALL ioconf_setatt_p('UNITS', 'K') 
    279     CALL ioconf_setatt_p('LONG_NAME','Potential surface temperature') 
    280     CALL restget_p (rest_id, 'tempsolpot', nbp_glo, 1, 1, kjit, .TRUE., temp_sol_pot, "gather", nbp_glo, index_g) 
    281     IF ( ALL( temp_sol_pot(:) .EQ. val_exp ) ) THEN  
    282        temp_sol_pot = temp_sol 
    283     ENDIF 
    284274     
    285275    CALL ioconf_setatt_p('UNITS', 'kg/m^2') 
     
    479469    CALL xios_orchidee_send_field("lwnet",lwnet) 
    480470    CALL xios_orchidee_send_field("Qv",fluxsubli) 
    481     CALL xios_orchidee_send_field("PotSurfT",temp_sol_pot) 
    482471 
    483472    DO ji=1,kjpindex 
     
    505494       CALL histwrite_p(hist_id, 'PotEvap', kjit, evapot_corr, kjpindex, index) 
    506495       CALL histwrite_p(hist_id, 'PotEvapOld', kjit, evapot, kjpindex, index) 
    507        CALL histwrite_p(hist_id, 'PotSurfT', kjit, temp_sol_pot, kjpindex, index) 
    508496       IF ( hist2_id > 0 ) THEN 
    509497          CALL histwrite_p(hist2_id, 'LWnet', kjit, lwnet, kjpindex, index) 
     
    564552    CALL restput_p(rest_id, 'fluxlat', nbp_glo, 1, 1, kjit,  fluxlat, 'scatter',  nbp_glo, index_g) 
    565553    CALL restput_p(rest_id, 'fluxsens', nbp_glo, 1, 1, kjit,  fluxsens, 'scatter',  nbp_glo, index_g) 
    566     CALL restput_p(rest_id, 'tempsolpot', nbp_glo, 1, 1, kjit, temp_sol_pot, 'scatter',  nbp_glo, index_g) 
    567554    CALL restput_p(rest_id, 'qsolpot', nbp_glo, 1, 1, kjit, q_sol_pot, 'scatter',  nbp_glo, index_g) 
    568555     
     
    605592    IF ( ALLOCATED (tair)) DEALLOCATE (tair) 
    606593    IF ( ALLOCATED (q_sol_pot)) DEALLOCATE (q_sol_pot) 
    607     IF ( ALLOCATED (temp_sol_pot)) DEALLOCATE (temp_sol_pot) 
    608594    
    609595  END SUBROUTINE enerbil_clear 
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/intersurf.f90

    r7259 r7265  
    253253    CALL xios_orchidee_init( MPI_COMM_ORCH,                        & 
    254254         date0,   year_end,  month_end,     day_end,  julian_diff, & 
    255          lon,     lat,       znt ) 
     255         lon,     lat ) 
    256256 
    257257    CALL sechiba_xios_initialize 
     
    10331033    CALL xios_orchidee_init( MPI_COMM_ORCH,                   & 
    10341034         date0,    year_end, month_end,     day_end, julian_diff, & 
    1035          tmp_lon,  tmp_lat,  znt ) 
     1035         tmp_lon,  tmp_lat ) 
    10361036 
    10371037    IF (printlev >= 3) WRITE(numout,*) 'intersurf_initialize_gathered: After xios_orchidee_init' 
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/ioipslctrl.f90

    r7255 r7265  
    990990          CALL histdef(hist_id, 'AvgSurfT', 'Average surface temperature', 'K', & 
    991991               & iim,jjm, hori_id, 1,1,1, -99, 32, avescatter(1), dt,dw) 
    992           CALL histdef(hist_id, 'PotSurfT', 'Potential (Unstressed) surface temperature', 'K', & 
    993                & iim,jjm, hori_id, 1,1,1, -99, 32, avescatter(1), dt,dw) 
    994992          CALL histdef(hist_id, 'RadT', 'Surface radiative temperature', 'K', & 
    995993               & iim,jjm, hori_id, 1,1,1, -99, 32, avescatter(1), dt,dw) 
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/slowproc.f90

    r7200 r7265  
    12071207    !Config Desc  = Interception reservoir coefficient 
    12081208    !Config If    = OK_SECHIBA  
    1209     !Config Def   = 0.1 
     1209    !Config Def   = 0.02 
    12101210    !Config Help  = Transforms leaf area index into size of interception reservoir 
    12111211    !Config         for slowproc_derivvar or stomate 
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/field_def_orchidee.xml

    r7260 r7265  
    313313    <field id="delswe" name="DelSWE" long_name="Accumulated change in Snow Water Equivalent (grid-cell total)" unit="kg/m^2" operation="accumulate"/> 
    314314    <field id="delswe_daily" field_ref="delswe" name="DelSWE_daily" long_name="Change in Snow Water Equivalent accumulated over each day" unit="kg/m^2/d" freq_op="1d" operation="average" > @delswe </field> 
    315     <field id="PotSurfT" name="PotSurfT" long_name="Potential (Unstressed) surface temperature" unit="K"/> 
    316315    <field id="soilmoist" name="SoilMoist" long_name="3D average layer soil moisture" unit="kg/m^2" grid_ref="grid_nslm"/> 
    317316    <field id="soilmoist_liquid" name="SoilMoistLiquid" long_name="3D average layer liquid soil moisture" unit="kg/m^2" grid_ref="grid_nslm"/> 
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/file_def_orchidee.xml

    r7256 r7265  
    614614    <field field_ref="laker" level="1"/> 
    615615    <field field_ref="pondr" level="1"/> 
    616     <field field_ref="PotSurfT" level="1"/> 
    617616    <field field_ref="albedo_glob" level="1"/> 
    618617    <field field_ref="soilalb_bg" grid_ref="grid_albtyp_out" name="Albedo_Background" level="1"/> 
Note: See TracChangeset for help on using the changeset viewer.