bugfix

magpiemodel · Nov 21, 2023 · b354839 · b354839
1 parent 0e55624
commit b354839
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/macros.gms b/core/macros.gms
@@ -99,6 +99,6 @@ $macro m_carbon_stock_ac(land,carbon_density,sets,sets_sub) \
             sum((&&sets_sub), land(j2,&&sets_sub) * sum(ct, carbon_density(ct,j2,&&sets_sub,ag_pools)))$(sameas(stockType,"actualNoAcEst"));
 
 * macro for peatland dynamics
-$macro m_peatland(pc58_peatland,peatland_item,vm_land,pcm_land,land_item,p58_scaling_factor) \
-            pc58_peatland(j2,peatland_item) + ((vm_land(j2,land_item)-pcm_land(j2,land_item)) * p58_scaling_factor(j2)) * \
-            (p58_scaling_factor(j2) * vm_land(j2,land_item) - pc58_peatland(j2,peatland_item)) / ((vm_land(j2,land_item) - pcm_land(j2,land_item)) * p58_scaling_factor(j2) + 1e-6)
+$macro m_peatland(peatland,peatland_item,vm_land,pcm_land,land_item,scaling_factor) \
+            peatland(j2,peatland_item) + ((vm_land(j2,land_item)-pcm_land(j2,land_item)) * scaling_factor(j2)) * \
+            (scaling_factor(j2) * vm_land(j2,land_item) - peatland(j2,peatland_item)) / ((vm_land(j2,land_item) - pcm_land(j2,land_item)) * scaling_factor(j2) + 1e-6)