Skip to content

Commit

Permalink
rv 81 Changes (M Longo)
Browse files Browse the repository at this point in the history
1. Bug fixes:
      a. Budget_utils is now a module.  Some compilers do not like
          when functions have pointers as arguments, unless they are inside 
          a module.
      b. In disturbance.f90, variable mask was not allocated when
          cpatch%ncohorts was zero, so the debugger would crash if it tried 
          to use mask.
      c. In average_utils.f90, daylight was used in divisions, but 
          the number can be zero- this should happen only in polar 
          nights so it should be fixed.
      d. Several disturbance-related variables were not properly set 
          to zero, leading to some crazy values in the big leaf model 
          whenever fires happened.
2. Added some diagnostic variables (means and mean sum of squares, 
          mostly radiation and u*)
3. Modified INCLUDE_FIRE = 3, now the water deficit threshold is 
          relative to the total rainfall instead of the absolute number.
4. Corrected some R scripts
  • Loading branch information
LevineLab committed Oct 16, 2012
2 parents 8fdf0d7 + 212f9c6 commit 01ff085
Show file tree
Hide file tree
Showing 55 changed files with 11,153 additions and 5,449 deletions.
24 changes: 14 additions & 10 deletions BRAMS/Template/RAMSIN
Original file line number Diff line number Diff line change
Expand Up @@ -2526,8 +2526,9 @@ $ED2_INFO
! 2. Fire will be triggered with enough biomass and the total soil !
! water at the top 75 cm falls below a threshold. !
! 3. Fire will be triggered with enough biomass and accumulated !
! 30-day water deficit exceeds the threshold given by SM_FIRE. !
! This is soil independent. !
! water deficit exceeds the threshold given by SM_FIRE times. !
! the total precipitation of the past 12 months. This method !
! does not directly depend on soil texture. !
! FIRE_PARAMETER -- If fire happens, this will control the intensity of the disturbance !
! given the amount of fuel (currently the total above-ground !
! biomass). !
Expand All @@ -2540,8 +2541,9 @@ $ED2_INFO
! 1m that will prevent fires to happen. The dry air soil !
! potential is defined as -3.1 MPa, so make sure SM_FIRE !
! is greater than this value. !
! When INCLUDE_FIRE = 3, only positive values are allowed. This is !
! the minimum water deficit, in kg/m2/30 days, to trigger fires. !
! When INCLUDE_FIRE = 3, values between 0 and 2 are allowed. This is !
! the minimum water deficit relative to the total rainfall, over the !
! past 12 months, to trigger fires. !
!---------------------------------------------------------------------------------------!
INCLUDE_FIRE = 2,
FIRE_PARAMETER = 0.5,
Expand All @@ -2563,12 +2565,14 @@ $ED2_INFO

!---------------------------------------------------------------------------------------!
! ICANTURB -- This flag controls the canopy roughness. !
! 0. Based on Leuning et al. (1995), wind is computed using the similarity !
! theory for the top cohort, and they are extinguished with cumulative !
! LAI. If using CROWN_MOD 1 or 2, this will use local LAI and average !
! by crown area. !
! 1. The default ED-2.1 scheme, except that it uses the zero-plane !
! displacement height. !
! 0. Based on Leuning et al. (1995) and LEAF-3 (Walko et al. 2000). !
! Roughness and displacement height are found using simple relations !
! with vegetation height; wind is computed using the similarity theory !
! for the top cohort, then it is assumed that wind extinguishes follow- !
! ing an exponential decay with "perceived" cumulative LAI (local LAI !
! with finite crown area). !
! 1. The default ED-2.1 scheme, similar to option 0, but the wind profile !
! is not based on LAI, instead it used the cohort height. !
! 2. This uses the method of Massman (1997) using constant drag and no !
! sheltering factor. !
! 3. This is also based on Massman (1997), but with the option of varying !
Expand Down
24 changes: 14 additions & 10 deletions BRAMS/run/RAMSIN
Original file line number Diff line number Diff line change
Expand Up @@ -2548,8 +2548,9 @@ $ED2_INFO
! 2. Fire will be triggered with enough biomass and the total soil !
! water at the top 75 cm falls below a threshold. !
! 3. Fire will be triggered with enough biomass and accumulated !
! 30-day water deficit exceeds the threshold given by SM_FIRE. !
! This is soil independent. !
! water deficit exceeds the threshold given by SM_FIRE times. !
! the total precipitation of the past 12 months. This method !
! does not directly depend on soil texture. !
! FIRE_PARAMETER -- If fire happens, this will control the intensity of the disturbance !
! given the amount of fuel (currently the total above-ground !
! biomass). !
Expand All @@ -2562,8 +2563,9 @@ $ED2_INFO
! 1m that will prevent fires to happen. The dry air soil !
! potential is defined as -3.1 MPa, so make sure SM_FIRE !
! is greater than this value. !
! When INCLUDE_FIRE = 3, only positive values are allowed. This is !
! the minimum water deficit, in kg/m2/30 days, to trigger fires. !
! When INCLUDE_FIRE = 3, values between 0 and 2 are allowed. This is !
! the minimum water deficit relative to the total rainfall, over the !
! past 12 months, to trigger fires. !
!---------------------------------------------------------------------------------------!
INCLUDE_FIRE = 2,
FIRE_PARAMETER = 0.5,
Expand All @@ -2585,12 +2587,14 @@ $ED2_INFO

!---------------------------------------------------------------------------------------!
! ICANTURB -- This flag controls the canopy roughness. !
! 0. Based on Leuning et al. (1995), wind is computed using the similarity !
! theory for the top cohort, and they are extinguished with cumulative !
! LAI. If using CROWN_MOD 1 or 2, this will use local LAI and average !
! by crown area. !
! 1. The default ED-2.1 scheme, except that it uses the zero-plane !
! displacement height. !
! 0. Based on Leuning et al. (1995) and LEAF-3 (Walko et al. 2000). !
! Roughness and displacement height are found using simple relations !
! with vegetation height; wind is computed using the similarity theory !
! for the top cohort, then it is assumed that wind extinguishes follow- !
! ing an exponential decay with "perceived" cumulative LAI (local LAI !
! with finite crown area). !
! 1. The default ED-2.1 scheme, similar to option 0, but the wind profile !
! is not based on LAI, instead it used the cohort height. !
! 2. This uses the method of Massman (1997) using constant drag and no !
! sheltering factor. !
! 3. This is also based on Massman (1997), but with the option of varying !
Expand Down
24 changes: 14 additions & 10 deletions ED/Template/Template/ED2IN
Original file line number Diff line number Diff line change
Expand Up @@ -1046,8 +1046,9 @@ $ED_NL
! 2. Fire will be triggered with enough biomass and the total soil !
! water at the top 75 cm falls below a threshold. !
! 3. Fire will be triggered with enough biomass and accumulated !
! 30-day water deficit exceeds the threshold given by SM_FIRE. !
! This is soil independent. !
! water deficit exceeds the threshold given by SM_FIRE times. !
! the total precipitation of the past 12 months. This method !
! does not directly depend on soil texture. !
! FIRE_PARAMETER -- If fire happens, this will control the intensity of the disturbance !
! given the amount of fuel (currently the total above-ground !
! biomass). !
Expand All @@ -1060,8 +1061,9 @@ $ED_NL
! 1m that will prevent fires to happen. The dry air soil !
! potential is defined as -3.1 MPa, so make sure SM_FIRE !
! is greater than this value. !
! When INCLUDE_FIRE = 3, only positive values are allowed. This is !
! the minimum water deficit, in kg/m2/day, to trigger fires. !
! When INCLUDE_FIRE = 3, values between 0 and 2 are allowed. This is !
! the minimum water deficit relative to the total rainfall, over the !
! past 12 months, to trigger fires. !
!---------------------------------------------------------------------------------------!
NL%INCLUDE_FIRE = myfire
NL%FIRE_PARAMETER = myfuel
Expand All @@ -1083,12 +1085,14 @@ $ED_NL

!---------------------------------------------------------------------------------------!
! ICANTURB -- This flag controls the canopy roughness. !
! 0. Based on Leuning et al. (1995), wind is computed using the similarity !
! theory for the top cohort, and they are extinguished with cumulative !
! LAI. If using CROWN_MOD 1 or 2, this will use local LAI and average !
! by crown area. !
! 1. The default ED-2.1 scheme, except that it uses the zero-plane !
! displacement height. !
! 0. Based on Leuning et al. (1995) and LEAF-3 (Walko et al. 2000). !
! Roughness and displacement height are found using simple relations !
! with vegetation height; wind is computed using the similarity theory !
! for the top cohort, then it is assumed that wind extinguishes follow- !
! ing an exponential decay with "perceived" cumulative LAI (local LAI !
! with finite crown area). !
! 1. The default ED-2.1 scheme, similar to option 0, but the wind profile !
! is not based on LAI, instead it used the cohort height. !
! 2. This uses the method of Massman (1997) using constant drag and no !
! sheltering factor. !
! 3. This is also based on Massman (1997), but with the option of varying !
Expand Down
Loading

0 comments on commit 01ff085

Please sign in to comment.