Merge branch 'master' into correct_soil_alignments

VOM_Fortran/VOM-code/modules.f90

@@ -134,6 +134,10 @@ module vegmod
       REAL*8, PARAMETER :: p_mpbar = 10.2d0       ! Conversion factor from MPa to bar
       REAL*8, PARAMETER :: p_E     = 2.7182818d0  ! Eurler's number
       REAL*8, PARAMETER :: p_R_    = 8.314d0      ! Molar gas konstant
+      REAL*8, PARAMETER :: l_E_    = 2.45d0       ! Latent heat of vaporization (MJ/kg)
+      REAL*8, PARAMETER :: srad2par_h = 2.0699d0  ! Conversion from srad to par hourly (mol/MJ)
+      REAL*8, PARAMETER :: srad2par_d = 2.0804d0  ! Conversion from srad to par daily (mol/MJ)
+      REAL*8, PARAMETER :: rho_wat = 1000.0d0     ! Density of water (kg/m3)
 
       INTEGER :: nyear                  ! Year
       INTEGER :: nday                   ! Day since start of run
@@ -344,6 +348,7 @@ module vegmod
       REAL*8  :: i_incrlaig             ! parameter determining maximum increment percentage of lai grasses
       REAL*8  :: i_extcoeffg            ! extinction coefficient beer's law grasses
       REAL*8  :: i_extcoefft            ! extinction coefficient beer's law trees
+      REAL*8  :: i_trans_vegcov         ! fraction of radiative energy reaching soil under full cover (0-1)
 
       INTEGER :: i_firstyear            ! First year for the generation of hourly output in computation mode
       INTEGER :: i_lastyear             ! Last year for the generation of hourly output in computation mode

VOM_Fortran/VOM-code/transpmodel.f90

@@ -453,7 +453,7 @@ subroutine vom_read_input ()
      &                    i_rrootm, i_rsurfmin, i_rsurf_, i_rootrad,   &
      &                    i_prootmg, i_growthmax, i_incrcovg,          &
      &                    i_incrjmax, i_incrlait, i_incrlaig,          &
-     &                    i_extcoeffg, i_extcoefft,                    &
+     &                    i_extcoeffg, i_extcoefft, i_trans_vegcov,    &
      &                    i_firstyear,i_lastyear, i_write_h, i_read_pc,&
      &                    i_lai_function,  i_no_veg,                   &
      &                    i_inputpath, i_outputpath,                   &

VOM_Fortran/VOM-code/watbal.f90

@@ -194,8 +194,8 @@ subroutine waterbalance_fluxes ()
 
 !     * soil evaporation
 
-      esoil__  = 0.0002d0 * (1.d0 - 0.8d0 * (o_cai + pcg_d(2)))        &
-     &         * par_h(th_) * su__(1)
+      esoil__  = (par_h(th_)/(srad2par_h * l_E_* rho_wat) ) * &
+                  (1.d0 - (1.d0-i_trans_vegcov) * (o_cai + pcg_d(2))) * su__(1)
 
 !     * Seepage face flow as a function of zw_ following eq_spgfcf in Watbal3.
 

VOM_Fortran/VOM-docu/html_docu/HowToRun.html

@@ -160,37 +160,35 @@ <h3>Compiling and testing the model</h3>
       </p>
 
     <h3>Running the model</h3>
-    <p>The model can be run in 4 different modes, defined by VOM_command in the VOM_namelist: <p>
-   <table border="1" width="100%">
+
+      <p>The executable "model.x" can be run with these input-files: <p>
+
+<table border="1" width="100%">
       <tbody>
         <tr>
           <td style="width: 195px;">
-            <h4>Mode</h4>
+            <h4>File</h4>
           </td>
           <td style="width: 1501px;">
             <h4>Description</h4>
           </td>
         </tr>
         <tr>
-          <td>1</td>
-          <td>Optimize the model with the Shuffled Complex Evolution algorithm. </td>
+          <td><a href="vom_namelist.html">vom_namelist</a></td>
+          <td>Contains all settings to run the VOM. </td>
         </tr>
         <tr>
-          <td>2</td>
-          <td>Run without optimization, based on the parameters in pars.txt.</td>
+          <td>pars.txt</td>
+          <td>Contains the (optimized) vegetation parameters (only needed for single run).</td>
         </tr>
         <tr>
-          <td>3</td>
-          <td>Run without optimization, based on the parameters in pars.txt. Returns only NCP values as output.</td>
-        </tr>
-        <tr>
-          <td>5</td>
-          <td>Randomly run the model.</td>
+          <td><a href="dailyweather.prn_inf">dailyweather.prn</a></td>
+          <td>Contains the meteorological forcing.</td>
         </tr>
         </tbody>
     </table>
 
-    <p> All options can be specified in the VOM_namelist. The inputpath, outputpath and VOM_namelist can also be specified on the command line, overruling the values set in the VOM_namelist <p>
+    <p> All options can be specified in the VOM_namelist. The inputpath, outputpath and VOM_namelist can also be specified on the command line, overruling the values set in the VOM_namelist: <p>
    <table border="1" width="100%">
       <tbody>
         <tr>
@@ -209,6 +207,41 @@ <h4>Description</h4>
     </table>
 
 
+<h3>Different model modes</h3>
+
+<p>The model can be run in 4 different modes, defined by VOM_command in the VOM_namelist: <p>
+   <table border="1" width="100%">
+      <tbody>
+        <tr>
+          <td style="width: 195px;">
+            <h4>Mode</h4>
+          </td>
+          <td style="width: 1501px;">
+            <h4>Description</h4>
+          </td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>Optimize the model with the Shuffled Complex Evolution algorithm. </td>
+        </tr>
+        <tr>
+          <td>2</td>
+          <td>Run without optimization, based on the parameters in pars.txt.</td>
+        </tr>
+        <tr>
+          <td>3</td>
+          <td>Run without optimization, based on the parameters in pars.txt. Returns only NCP values as output.</td>
+        </tr>
+        <tr>
+          <td>5</td>
+          <td>Randomly run the model.</td>
+        </tr>
+        </tbody>
+    </table>
+
+
+
+
 
 
     <h3>Running the model in parallel</h3>

VOM_Fortran/VOM-docu/html_docu/vom_namelist.html

@@ -138,11 +138,32 @@ <h3>Fields</h3>
 	<td align="center">flag to read vegetation coverage values from file</td>
 	<td align="center"> - </td>
 </tr>
+<tr>
+	<td align="center">i_trans_vegcov</td>
+	<td align="center">fraction of radiative energy reaching soil under full cover (0-1), used only for calculation of soil evaporation. </td>
+	<td align="center"> - </td>
+</tr>
 <tr>
 	<td align="center">i_lai_function</td>
 	<td align="center">switch for 1) linear or 2) exponential function of LAI for foliage cost</td>
 	<td align="center"> - </td>
 </tr>
+
+<tr>
+	<td align="center">i_no_veg</td>
+	<td align="center">switch for running VOM without vegetation (0-with, 1-without)</td>
+	<td align="center"> - </td>
+</tr>
+<tr>
+	<td align="center">i_extcoeffg</td>
+	<td align="center">extinction coefficient beer's law grasses </td>
+	<td align="center"> - </td>
+</tr>
+<tr>
+	<td align="center">i_extcoefft</td>
+	<td align="center">extinction coefficient beer's law trees </td>
+	<td align="center"> - </td>
+</tr>
 <tr>
 	<td align="center">i_inputpath</td>
 	<td align="center">path to folder with inputfiles </td>
@@ -305,8 +326,20 @@ <h3>Fields</h3>
 <tr>
 	<td align="center">n_thread</td>
 	<td align="center">number of threads to be used in parallel</td>
+	<td align="center"> True/False </td>
+</tr>
+<tr>
+	<td align="center">sce_restart</td>
+	<td align="center">restart SCE from previous run</td>
 	<td align="center"> - </td>
 </tr>
+<tr>
+	<td align="center">runtime_limit</td>
+	<td align="center">time before sce stops</td>
+	<td align="center"> minutes </td>
+</tr>
+
+
 
 
 <tr>

VOM_Fortran/VOM-input/vom_namelist

@@ -25,7 +25,9 @@ i_firstyear=2000,       ! firstyear for the generation of hourly output in compu
 i_lastyear=2000,        ! lastyear for the generation of hourly output in computation mode
 i_write_h=0,            ! flag to greate a file with hourly values from daily values
 i_read_pc=0,            ! flag to read vegetation coverage values from file
-i_lai_function=2,       ! switch for 1) linear or 2) exponential function of LAI for foliage cost
+i_trans_vegcov=0.2d0,   ! fraction of radiative energy reaching soil under full cover (0-1)
+i_lai_function=1,       ! switch for 1) linear or 2) exponential function of LAI for foliage cost
+i_no_veg=0,             ! switch for running VOM without vegetation (0-with, 1-without)
 i_extcoeffg=0.5d0,      ! extinction coefficient beer's law grasses
 i_extcoefft=0.5d0,      ! extinction coefficient beer's law trees
 i_inputpath="input/",   ! path to folder with inputfiles