Added init_n_cohorts to myinterface

geco-bern · Apr 26, 2024 · ffc6e81 · ffc6e81
1 parent 9e96574
commit ffc6e81
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/data-raw/generate_biomee_driver_data.R b/data-raw/generate_biomee_driver_data.R
@@ -157,6 +157,7 @@ params_soil <- tibble(
 )
 
 init_cohort <- tibble(
+  init_n_cohorts = 1,   # number of PFTs
   init_cohort_species = rep(1, 10),    # indicates sps # 1 - Fagus sylvatica
   init_cohort_nindivs = rep(0.05,10),  # initial individual density, individual/m2 ! 1 indiv/m2 = 10.000 indiv/ha
   init_cohort_bl      = rep(0.0,10),   # initial biomass of leaves, kg C/individual

diff --git a/data/biomee_gs_leuning_drivers.rda b/data/biomee_gs_leuning_drivers.rda
diff --git a/data/biomee_p_model_drivers.rda b/data/biomee_p_model_drivers.rda
diff --git a/src/datatypes.mod.f90 b/src/datatypes.mod.f90
@@ -528,7 +528,7 @@ module datatypes
 
   !=============== Initial cohort specifications in R ============================================
   ! Initial values passed through R 
-  integer :: init_n_cohorts                        = MAX_INIT_COHORTS
+  ! integer :: init_n_cohorts                        = MAX_INIT_COHORTS
   ! integer :: init_cohort_species(MAX_INIT_COHORTS) = 2
   ! real    :: init_cohort_nindivs(MAX_INIT_COHORTS) = 1.0  ! initial individual density, individual/m2
   ! real    :: init_cohort_bl(MAX_INIT_COHORTS)      = 0.0  ! initial biomass of leaves, kg C/individual

diff --git a/src/interface_biosphere_biomee.mod.f90 b/src/interface_biosphere_biomee.mod.f90
@@ -97,7 +97,8 @@ module md_interface_biomee
   end type paramstype_species
 
   type inittype_cohort 
-    real :: init_cohort_species
+    integer :: init_n_cohorts
+    integer :: init_cohort_species
     real :: init_cohort_nindivs
     real :: init_cohort_bl
     real :: init_cohort_br

diff --git a/src/sofun_r.f90 b/src/sofun_r.f90
@@ -405,7 +405,7 @@ subroutine biomee_f(            &
     ! naked arrays
     real(kind=c_double), dimension(0:MSPECIES,55), intent(in)       :: params_species
     real(kind=c_double), dimension(n_dim_soil_types,8), intent(in)  :: params_soil
-    real(kind=c_double), dimension(MAX_INIT_COHORTS,8),  intent(in) :: init_cohort
+    real(kind=c_double), dimension(MAX_INIT_COHORTS,9),  intent(in) :: init_cohort
 
     ! initial soil pool size
     real(kind=c_double), intent(in) :: init_fast_soil_C
@@ -633,14 +633,15 @@ subroutine biomee_f(            &
 
 
     ! Initial cohort sizes
-    myinterface%init_cohort(:)%init_cohort_species = int(init_cohort(:,1))
-    myinterface%init_cohort(:)%init_cohort_nindivs = real(init_cohort(:,2))
-    myinterface%init_cohort(:)%init_cohort_bl      = real(init_cohort(:,3))
-    myinterface%init_cohort(:)%init_cohort_br      = real(init_cohort(:,4))
-    myinterface%init_cohort(:)%init_cohort_bsw     = real(init_cohort(:,5))
-    myinterface%init_cohort(:)%init_cohort_bHW     = real(init_cohort(:,6))
-    myinterface%init_cohort(:)%init_cohort_seedC   = real(init_cohort(:,7))
-    myinterface%init_cohort(:)%init_cohort_nsc     = real(init_cohort(:,8))
+    myinterface%init_cohort(:)%init_n_cohorts      = int(init_cohort(:,1))
+    myinterface%init_cohort(:)%init_cohort_species = int(init_cohort(:,2))
+    myinterface%init_cohort(:)%init_cohort_nindivs = real(init_cohort(:,3))
+    myinterface%init_cohort(:)%init_cohort_bl      = real(init_cohort(:,4))
+    myinterface%init_cohort(:)%init_cohort_br      = real(init_cohort(:,5))
+    myinterface%init_cohort(:)%init_cohort_bsw     = real(init_cohort(:,6))
+    myinterface%init_cohort(:)%init_cohort_bHW     = real(init_cohort(:,7))
+    myinterface%init_cohort(:)%init_cohort_seedC   = real(init_cohort(:,8))
+    myinterface%init_cohort(:)%init_cohort_nsc     = real(init_cohort(:,9))
 
     ! Initial soil pools
     myinterface%init_soil%init_fast_soil_C = real( init_fast_soil_C )

diff --git a/src/vegetation_biomee.mod.f90 b/src/vegetation_biomee.mod.f90
@@ -2235,7 +2235,7 @@ subroutine initialize_vegn_tile( vegn, nCohorts )
     integer,parameter :: rand_seed = 86456
     real    :: r
     real    :: btotal
-    integer :: i, istat
+    integer :: i, istat, init_n_cohorts
     ! integer :: io           ! i/o status for the namelist
     ! integer :: ierr         ! error code, returned by i/o routines
     ! integer :: nml_unit