Master fix ningorg refill (#283)

* Update upload-artifact version to v4 (compulsory) * Undo changes made to Recover_N_balance by mistake. Note that the hardcoded ninorg content is set to init_Nmineral rather than the hardcoded value 0.2. The rest of the changes are just a revert to the original code. --------- Co-authored-by: marcadella <mayeul.marcadella@unibe.ch>
geco-bern · Feb 4, 2025 · 7be32ed · 7be32ed
1 parent a965ec6
commit 7be32ed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/data/biomee_gs_leuning_output.rda b/data/biomee_gs_leuning_output.rda
diff --git a/data/biomee_p_model_output.rda b/data/biomee_p_model_output.rda
diff --git a/src/datatypes.mod.f90 b/src/datatypes.mod.f90
@@ -932,26 +932,16 @@ end subroutine annual_diagnostics_post_mortality
 
   subroutine Recover_N_balance(vegn)
     !////////////////////////////////////////////////////////////////////////
-    ! We scale the N pools to contrain the yearly N (soil + plant) to be constant.
+    ! Update psoil_sl in order to keep the total N constant
+    ! Note: this leads to negative N pools...
     !------------------------------------------------------------------------
     type(vegn_tile_type), intent(inout) :: vegn
     real :: delta, scaling_factor
 
     delta = vegn%totN - vegn%initialN0
 
     if (abs(delta) > 1e-6) then
-      scaling_factor = 1 - delta / vegn%totN
-
-      vegn%psoil_sl%n%n14 = vegn%psoil_sl%n%n14 * scaling_factor
-      vegn%psoil_fs%n%n14 = vegn%psoil_fs%n%n14 * scaling_factor
-      vegn%pmicr%n%n14    = vegn%pmicr%n%n14    * scaling_factor
-      vegn%ninorg%n14     = vegn%ninorg%n14     * scaling_factor
-      vegn%plabl%n%n14    = vegn%plabl%n%n14    * scaling_factor
-      vegn%pseed%n%n14    = vegn%pseed%n%n14    * scaling_factor
-      vegn%pleaf%n%n14    = vegn%pleaf%n%n14    * scaling_factor
-      vegn%proot%n%n14    = vegn%proot%n%n14    * scaling_factor
-      vegn%psapw%n%n14    = vegn%psapw%n%n14    * scaling_factor
-      vegn%pwood%n%n14    = vegn%pwood%n%n14    * scaling_factor
+      vegn%psoil_sl%n%n14 = vegn%psoil_sl%n%n14 - delta
       vegn%totN = vegn%initialN0
     endif
   end subroutine Recover_N_balance

diff --git a/src/vegetation_biomee.mod.f90 b/src/vegetation_biomee.mod.f90
@@ -1449,7 +1449,7 @@ subroutine vegn_N_uptake(vegn, tsoil)
     integer :: i
 
     ! We artificially refill N inorg
-    if (myinterface%params_siml%do_closedN_run) vegn%ninorg%n14 = 0.2
+    if (myinterface%params_siml%do_closedN_run) vegn%ninorg%n14 = myinterface%init_soil%init_Nmineral
 
     ! Nitrogen uptake parameter
     ! It considers competition here. How much N one can absorp depends on