Skip to content

Commit

Permalink
Merge pull request #396 from mpaiao/mpaiao-pr-logging
Browse files Browse the repository at this point in the history 
Selective logging update
  • Loading branch information
@mpaiao
mpaiao committed Jul 24, 2024
2 parents 5130f4f + 511be65 commit 0e62e19
Show file tree
Hide file tree
Showing 20 changed files with 1,150 additions and 296 deletions.
2 changes: 2 additions & 0 deletions BRAMS/Template/RAMSIN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3028,6 +3028,7 @@ $ED2_INFO
! The following variables are used when IANTH_DISTURB is 1 or 2. !
! !
! SL_SKID_REL_AREA -- area damaged by skid trails (relative to felled area). !
! SL_SKID_DBH_THRESH -- DBH threshold for damage caused in skid trails. !
! SL_SKID_S_GTHARV -- survivorship of trees with DBH > MINDBH in skid trails. !
! SL_SKID_S_LTHARV -- survivorship of trees with DBH < MINDBH in skid trails. !
! SL_FELLING_S_LTHARV -- survivorship of trees with DBH < MINDBH in felling gaps. !
Expand All @@ -3047,6 +3048,7 @@ $ED2_INFO
SL_MINDBH_HARVEST = 35.0,35.0,35.0,
SL_BIOMASS_HARVEST = 0.,
SL_SKID_REL_AREA = 0.6,
SL_SKID_DBH_THRESH = 30.,
SL_SKID_S_GTHARV = 1.00,
SL_SKID_S_LTHARV = 0.60,
SL_FELLING_S_LTHARV = 0.35,
Expand Down
2 changes: 2 additions & 0 deletions BRAMS/run/RAMSIN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3046,6 +3046,7 @@ $ED2_INFO
! The following variables are used when IANTH_DISTURB is 1 or 2. !
! !
! SL_SKID_REL_AREA -- area damaged by skid trails (relative to felled area). !
! SL_SKID_DBH_THRESH -- DBH threshold for damage caused in skid trails. !
! SL_SKID_S_GTHARV -- survivorship of trees with DBH > MINDBH in skid trails. !
! SL_SKID_S_LTHARV -- survivorship of trees with DBH < MINDBH in skid trails. !
! SL_FELLING_S_LTHARV -- survivorship of trees with DBH < MINDBH in felling gaps. !
Expand All @@ -3065,6 +3066,7 @@ $ED2_INFO
SL_MINDBH_HARVEST = 35.0,35.0,35.0,
SL_BIOMASS_HARVEST = 0.,
SL_SKID_REL_AREA = 0.6,
SL_SKID_DBH_THRESH = 30.,
SL_SKID_S_GTHARV = 1.00,
SL_SKID_S_LTHARV = 0.60,
SL_FELLING_S_LTHARV = 0.35,
Expand Down
16 changes: 9 additions & 7 deletions BRAMS/src/ed2/edcp_load_namelist.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ subroutine read_ednl(iunit,filename)
, sl_mindbh_harvest & ! intent(out)
, sl_biomass_harvest & ! intent(out)
, sl_skid_rel_area & ! intent(out)
, sl_skid_dbh_thresh & ! intent(out)
, sl_skid_s_gtharv & ! intent(out)
, sl_skid_s_ltharv & ! intent(out)
, sl_felling_s_ltharv & ! intent(out)
Expand Down Expand Up @@ -305,13 +306,14 @@ subroutine read_ednl(iunit,filename)
,lwidth_grass,lwidth_bltree,lwidth_nltree,q10_c3,q10_c4,thetacrit &
,quantum_efficiency_t,n_plant_lim,n_decomp_lim,include_fire,sl_pft &
,sl_prob_harvest,sl_mindbh_harvest,sl_biomass_harvest &
,sl_skid_rel_area,sl_skid_s_gtharv,sl_skid_s_ltharv &
,sl_felling_s_ltharv,cl_fseeds_harvest,cl_fstorage_harvest &
,cl_fleaf_harvest,icanturb,include_these_pft,pasture_stock &
,agri_stock,plantation_stock,pft_1st_check,ifusion,maxpatch &
,maxcohort,min_patch_area,treefall_disturbance_rate,time2canopy &
,iprintpolys,npvars,printvars,pfmtstr,ipmin,ipmax,imetrad,iphenys1 &
,iphenysf,iphenyf1,iphenyff,iedcnfgf,event_file,phenpath
,sl_skid_rel_area,sl_skid_dbh_thresh,sl_skid_s_gtharv &
,sl_skid_s_ltharv,sl_felling_s_ltharv,cl_fseeds_harvest &
,cl_fstorage_harvest,cl_fleaf_harvest,icanturb,include_these_pft &
,pasture_stock,agri_stock,plantation_stock,pft_1st_check,ifusion &
,maxpatch,maxcohort,min_patch_area,treefall_disturbance_rate &
,time2canopy,iprintpolys,npvars,printvars,pfmtstr,ipmin,ipmax &
,imetrad,iphenys1,iphenysf,iphenyf1,iphenyff,iedcnfgf,event_file &
,phenpath

!----- Initialise some database variables with a non-sense path. -----------------------!
islcolflg (:) = undef_integer
Expand Down
4 changes: 4 additions & 0 deletions BRAMS/src/ed2/edcp_mpiutils.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ subroutine masterput_ednl(mainnum)
, sl_mindbh_harvest & ! intent(in)
, sl_biomass_harvest & ! intent(in)
, sl_skid_rel_area & ! intent(in)
, sl_skid_dbh_thresh & ! intent(in)
, sl_skid_s_gtharv & ! intent(in)
, sl_skid_s_ltharv & ! intent(in)
, sl_felling_s_ltharv & ! intent(in)
Expand Down Expand Up @@ -385,6 +386,7 @@ subroutine masterput_ednl(mainnum)
call MPI_Bcast(sl_mindbh_harvest ,n_pft,MPI_REAL ,mainnum,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_biomass_harvest , 1,MPI_REAL ,mainnum,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_skid_rel_area , 1,MPI_REAL ,mainnum,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_skid_dbh_thresh , 1,MPI_REAL ,mainnum,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_skid_s_gtharv , 1,MPI_REAL ,mainnum,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_skid_s_ltharv , 1,MPI_REAL ,mainnum,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_felling_s_ltharv, 1,MPI_REAL ,mainnum,MPI_COMM_WORLD,ierr)
Expand Down Expand Up @@ -709,6 +711,7 @@ subroutine nodeget_ednl(master_num)
, sl_mindbh_harvest & ! intent(out)
, sl_biomass_harvest & ! intent(out)
, sl_skid_rel_area & ! intent(out)
, sl_skid_dbh_thresh & ! intent(out)
, sl_skid_s_gtharv & ! intent(out)
, sl_skid_s_ltharv & ! intent(out)
, sl_felling_s_ltharv & ! intent(out)
Expand Down Expand Up @@ -911,6 +914,7 @@ subroutine nodeget_ednl(master_num)
call MPI_Bcast(sl_mindbh_harvest ,n_pft,MPI_REAL ,master_num,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_biomass_harvest , 1,MPI_REAL ,master_num,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_skid_rel_area , 1,MPI_REAL ,master_num,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_skid_dbh_thresh , 1,MPI_REAL ,master_num,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_skid_s_gtharv , 1,MPI_REAL ,master_num,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_skid_s_ltharv , 1,MPI_REAL ,master_num,MPI_COMM_WORLD,ierr)
call MPI_Bcast(sl_felling_s_ltharv, 1,MPI_REAL ,master_num,MPI_COMM_WORLD,ierr)
Expand Down
2 changes: 2 additions & 0 deletions ED/Template/Template/ED2IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1578,6 +1578,7 @@ $ED_NL
! The following variables are used when IANTH_DISTURB is 1 or 2. !
! !
! SL_SKID_REL_AREA -- area damaged by skid trails (relative to felled area). !
! SL_SKID_DBH_THRESH -- DBH threshold for damage caused in skid trails. !
! SL_SKID_S_GTHARV -- survivorship of trees with DBH > MINDBH in skid trails. !
! SL_SKID_S_LTHARV -- survivorship of trees with DBH < MINDBH in skid trails. !
! SL_FELLING_S_LTHARV -- survivorship of trees with DBH < MINDBH in felling gaps. !
Expand All @@ -1597,6 +1598,7 @@ $ED_NL
NL%SL_MINDBH_HARVEST = mydbhharv
NL%SL_BIOMASS_HARVEST = mybioharv
NL%SL_SKID_REL_AREA = myskidarea
NL%SL_SKID_DBH_THRESH = myskiddbhthresh
NL%SL_SKID_S_GTHARV = myskidlarge
NL%SL_SKID_S_LTHARV = myskidsmall
NL%SL_FELLING_S_LTHARV = myfellingsmall
Expand Down
3 changes: 2 additions & 1 deletion ED/run/ED2IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1592,6 +1592,7 @@ $ED_NL
! The following variables are used when IANTH_DISTURB is 1 or 2. !
! !
! SL_SKID_REL_AREA -- area damaged by skid trails (relative to felled area). !
! SL_SKID_DBH_THRESH -- DBH threshold for damage caused in skid trails. !
! SL_SKID_S_GTHARV -- survivorship of trees with DBH > MINDBH in skid trails. !
! SL_SKID_S_LTHARV -- survivorship of trees with DBH < MINDBH in skid trails. !
! SL_FELLING_S_LTHARV -- survivorship of trees with DBH < MINDBH in felling gaps. !
Expand All @@ -1604,14 +1605,14 @@ $ED_NL
!---------------------------------------------------------------------------------------!
NL%IANTH_DISTURB = 0
NL%SL_SCALE = 1
NL%SL_SCALE = 0
NL%SL_YR_FIRST = 1992
NL%SL_NYRS = 50
NL%SL_PFT = 2,3,4
NL%SL_PROB_HARVEST = 1.0,1.0,1.0
NL%SL_MINDBH_HARVEST = 50.,50.,50.
NL%SL_BIOMASS_HARVEST = 0
NL%SL_SKID_REL_AREA = 1
NL%SL_SKID_DBH_THRESH = 30.
NL%SL_SKID_S_GTHARV = 1
NL%SL_SKID_S_LTHARV = 0.6
NL%SL_FELLING_S_LTHARV = 0.35
Expand Down
Loading

0 comments on commit 0e62e19

Please sign in to comment.