Add new basic function: spline

source/carbon/carbon_model_to_core_fun_kit.f90

@@ -41,6 +41,8 @@ contains
                 fun_kit%fun => fun_mm
             case('step')
                 fun_kit%fun => fun_step
+            !case('spline')
+                !fun_kit%fun => fun_spline
             case default
                 stop "check failed : unknown funtype at set_fun"
         end select
@@ -124,4 +126,14 @@ contains
         y = pars(5) * pars(4)**( pars(3) * (args(1) - pars(2)) ) + pars(1)
     end function fun_exp
     
+    !> Spline function: y = (a+k)*x + (y0+c)/2 + (a-k)/2*|x-x0|
+    function fun_spline(args, pars) result(y)
+        implicit none
+        real, intent(in) :: args(narg_default)
+        real, intent(in) :: pars(npar_default)
+        real :: y
+        y = (pars(4)+pars(3))*args(1) + (pars(1)+pars(5))/2 + (pars(4)-pars(3))/2*abs(args(1)-pars(2))
+    end function fun_spline 
+    
+
 end module

source/carbon/carbon_models/carbon_model_INMCM.f90

@@ -34,8 +34,8 @@ contains
 
         call set_pool(pid = n_Catm,   name = 'catm'                                             )
         call set_pool(pid = n_Cveg,   name = 'cveg'   ,                          alias = Cveg   )
-        call set_pool(pid = n_Csoil,  name = 'csoil'  ,initial_value = 2.78124, alias = Csoil  )
-        call set_pool(pid = n_Csoilb, name = 'csoilb' ,initial_value = 0.05676, alias = Csoilb )
+        call set_pool(pid = n_Csoil,  name = 'csoil'  ,initial_value = 2.983218, alias = Csoil  )
+        call set_pool(pid = n_Csoilb, name = 'csoilb' ,initial_value = 0.060882, alias = Csoilb )
 
 !        station: opt: С1:        С2:
 !        ROST     1    8.730624   0.178176

source/carbon/carbon_models/carbon_model_SOCS.f90

@@ -25,8 +25,8 @@ module carbon_model_socs
 
             call set_pool(pid = n_Catm,   name = 'catm')
             call set_pool(pid = n_Cveg,   name = 'cveg')
-            call set_pool(pid = n_Csoil1, name = 'csoil1',initial_value = 0.0569418, alias = C1)
-            call set_pool(pid = n_Csoil2, name = 'csoil2',initial_value = 2.7901482, alias = C2)
+            call set_pool(pid = n_Csoil1, name = 'csoil1',initial_value = 0.060888, alias = C1)
+            call set_pool(pid = n_Csoil2, name = 'csoil2',initial_value = 2.983512, alias = C2)
 
 !        station: opt: С1:        С2:
 !        DAO4     1    0.061994   3.037706