bugfix carbon density

magpiemodel · May 30, 2024 · f56a0c1 · f56a0c1
1 parent f9be6ac
commit f56a0c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/29_cropland/detail_apr24/preloop.gms b/modules/29_cropland/detail_apr24/preloop.gms
@@ -32,9 +32,9 @@ pc29_treecover(j,ac) = (pc29_treecover_share(j) * pm_land_hist("y1995",j,"crop")
 *' 0 = Use natveg growth curve towards LPJmL natural vegetation
 *' 1 = Use plantation growth curve (faster than natveg) towards LPJmL natural vegetation
 if(s29_treecover_plantation = 0,
- p29_carbon_density_ac(t,j,ac,ag_pools) = pm_carbon_density_ac(t,j,ac,ag_pools);
+ p29_carbon_density_ac(t,j,ac,ag_pools) = pm_carbon_density_secdforest_ac(t,j,ac,ag_pools);
 elseif s29_treecover_plantation = 1,
- p29_carbon_density_ac(t,j,ac,ag_pools) = pm_carbon_density_ac_forestry(t,j,ac,ag_pools);
+ p29_carbon_density_ac(t,j,ac,ag_pools) = pm_carbon_density_plantation_ac(t,j,ac,ag_pools);
 );
 
 ** set bii coefficients

diff --git a/modules/29_cropland/simple_apr24/not_used.txt b/modules/29_cropland/simple_apr24/not_used.txt
@@ -3,6 +3,6 @@ pm_land_hist,input,not needed
 fm_luh2_side_layers,input,not needed
 pm_interest,input,not needed
 fm_bii_coeff,input,not needed
-pm_carbon_density_ac,input,not needed
-pm_carbon_density_ac_forestry,input,not needed
+pm_carbon_density_secdforest_ac,input,not needed
+pm_carbon_density_plantation_ac,input,not needed
 fm_carbon_density,input,not needed