bump version to rc4

ecoforecastVT · Oct 14, 2017 · e0c57f9 · e0c57f9
1 parent 8cf8c34
commit e0c57f9
Show file tree

Hide file tree

Showing 21 changed files with 87,823 additions and 87,818 deletions.
diff --git a/Examples/2.4.0/EllenBrook/glm2.nml b/Examples/2.4.0/EllenBrook/glm2.nml
@@ -128,19 +128,19 @@
  crest_elev = 18.0000,
  bsn_len = 761.4900,
  bsn_wid = 1015.9130,
- bsn_vals = 21, 
+ bsn_vals = 21,
  A = 1000,5600,7600,9200,11200,15600,25600,46800,64800,86400,108400,130800,154800,182800,211600,245200,273200,303200,320000,336800,345200,
  H = 16.0000,16.1000,16.2000,16.3000,16.4000,16.5000,16.6000,16.7000,16.8000,16.9000,17.0000,17.1000,17.2000,17.3000,17.4000,17.5000,17.6000,17.7000,17.8000,17.9000,18.0000,
 
- 
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
+
 /
- 
+
 !-------------------------------------------------------------------------------
 ! duration of run
 !-------------------------------------------------------------------------------
@@ -231,7 +231,7 @@
  'salt',
  'OXY_oxy',
  csv_ovrflw_fname = "overflow"
- 
+
 /
 
 !-------------------------------------------------------------------------------

diff --git a/Examples/2.4.0/GrosseDhuenn/glm2.nml b/Examples/2.4.0/GrosseDhuenn/glm2.nml
@@ -2,11 +2,11 @@
 ! general model setup
 !-------------------------------------------------------------------------------
 !
-! sim_name [string] title of simulation 
-! max_layers [integer] maximum number of layers 
-! min_layer_vol [real] minimum layer volume (m3 * 1000) 
-! min_layer_thick [real] minimum thickness of a layer (m) 
-! max_layer_thick [real] maximum thickness of a layer (m) 
+! sim_name [string] title of simulation
+! max_layers [integer] maximum number of layers
+! min_layer_vol [real] minimum layer volume (m3 * 1000)
+! min_layer_thick [real] minimum thickness of a layer (m)
+! max_layer_thick [real] maximum thickness of a layer (m)
 ! Kw [real] background light attenuation (m**-1)
 ! coef_inf_entrain [real] entrainment coefficient inflow
 ! coef_mix_conv [real] mixing efficiency - convective overturn
@@ -131,23 +131,23 @@
  172.00, 172.20, 172.40, 172.60, 172.80, 173.00, 173.20, 173.40, 173.60, 173.80,
  174.00, 174.20, 174.40, 174.60, 174.80, 175.00, 175.20, 175.40, 175.60, 175.80,
  176.00, 176.20, 176.40, 176.60, 176.80, 177.00, 177.20, 177.40, 177.50
- A = 10, 32880, 68140, 70440, 85160, 118560, 151000, 178040, 202060, 223740, 
- 243160, 260600, 276640, 291460, 304860, 318020, 335600, 357220, 376840, 394880, 
- 419480, 450620, 479900, 506220, 533680, 563600, 597160, 633660, 669040, 702480, 
- 734940, 766800, 798780, 831060, 932600, 970660, 1009100, 1047660, 1088500, 1130980, 
- 1170480, 1196000, 1210250, 1224750, 1239300, 1254000, 1268900, 1283600, 1298300, 1312850, 
- 1327300, 1341750, 1356850, 1372550, 1389050, 1406150, 1423700, 1440700, 1456800, 1471950, 
- 1486350, 1500050, 1513850, 1527950, 1542400, 1557150, 1572250, 1587550, 1603100, 1618850, 
- 1634900, 1651050, 1667200, 1683250, 1699150, 1715000, 1730750, 1746250, 1761650, 1776800, 
- 1791800, 1806700, 1822200, 1838350, 1855200, 1872650, 1890650, 1908400, 1925600, 1942500, 
- 1958800, 1974900, 1991250, 2008050, 2025350, 2043100, 2061150, 2079250, 2097300, 2115250, 
- 2133150, 2151000, 2169000, 2187200, 2205550, 2224100, 2242750, 2261250, 2279700, 2297850, 
- 2315850, 2333850, 2352100, 2370800, 2390000, 2409550, 2429600, 2449700, 2470000, 2490450, 
- 2511050, 2531600, 2551950, 2571900, 2591550, 2610750, 2629700, 2648750, 2667900, 2687350, 
- 2706800, 2726600, 2746700, 2767200, 2788200, 2809550, 2831200, 2852600, 2873500, 2894050, 
- 2914200, 2933900, 2953300, 2972350, 2991150, 3009550, 3027900, 3046700, 3066050, 3086150, 
- 3106750, 3127800, 3148450, 3168400, 3187700, 3206350, 3224500, 3242600, 3260750, 3279050, 
- 3297400, 3315950, 3335050, 3354650, 3374850, 3395700, 3416950, 3438100, 3459200, 3480950, 
+ A = 10, 32880, 68140, 70440, 85160, 118560, 151000, 178040, 202060, 223740,
+ 243160, 260600, 276640, 291460, 304860, 318020, 335600, 357220, 376840, 394880,
+ 419480, 450620, 479900, 506220, 533680, 563600, 597160, 633660, 669040, 702480,
+ 734940, 766800, 798780, 831060, 932600, 970660, 1009100, 1047660, 1088500, 1130980,
+ 1170480, 1196000, 1210250, 1224750, 1239300, 1254000, 1268900, 1283600, 1298300, 1312850,
+ 1327300, 1341750, 1356850, 1372550, 1389050, 1406150, 1423700, 1440700, 1456800, 1471950,
+ 1486350, 1500050, 1513850, 1527950, 1542400, 1557150, 1572250, 1587550, 1603100, 1618850,
+ 1634900, 1651050, 1667200, 1683250, 1699150, 1715000, 1730750, 1746250, 1761650, 1776800,
+ 1791800, 1806700, 1822200, 1838350, 1855200, 1872650, 1890650, 1908400, 1925600, 1942500,
+ 1958800, 1974900, 1991250, 2008050, 2025350, 2043100, 2061150, 2079250, 2097300, 2115250,
+ 2133150, 2151000, 2169000, 2187200, 2205550, 2224100, 2242750, 2261250, 2279700, 2297850,
+ 2315850, 2333850, 2352100, 2370800, 2390000, 2409550, 2429600, 2449700, 2470000, 2490450,
+ 2511050, 2531600, 2551950, 2571900, 2591550, 2610750, 2629700, 2648750, 2667900, 2687350,
+ 2706800, 2726600, 2746700, 2767200, 2788200, 2809550, 2831200, 2852600, 2873500, 2894050,
+ 2914200, 2933900, 2953300, 2972350, 2991150, 3009550, 3027900, 3046700, 3066050, 3086150,
+ 3106750, 3127800, 3148450, 3168400, 3187700, 3206350, 3224500, 3242600, 3260750, 3279050,
+ 3297400, 3315950, 3335050, 3354650, 3374850, 3395700, 3416950, 3438100, 3459200, 3480950,
  3504350, 3528400, 3549400, 3566700, 3593950, 3644300, 3708400, 3745450, 3750100
 /
 !-------------------------------------------------------------------------------
@@ -225,7 +225,7 @@
 ! 'salt',
 ! 'OXY_oxy',
 ! csv_ovrflw_fname = "overflow"
- 
+
 /
 !-------------------------------------------------------------------------------
 ! initial condition profiles
@@ -248,7 +248,7 @@
  ! GLM
  the_temps = 5, 5
  the_sals = 0.075, 0.075
- ! WQ 
+ ! WQ
  !num_wq_vars = 0
  !wq_names = 'aed_organic_matter_don',
  ! 'aed_organic_matter_pon',
@@ -278,8 +278,8 @@
 ! ch [real] bulk aerodynamic coefficient for sensible heat transfer
 ! coef_wind_drag Bulk aerodynamic coefficient for transfer of momentum
 ! subdaily [bool] daily meteorological input data (false)
-! subdaily meteorological input data (true); 
-! in subdaily case: timestep of meteorology data = dt 
+! subdaily meteorological input data (true);
+! in subdaily case: timestep of meteorology data = dt
 !
 !-------------------------------------------------------------------------------
 &meteorology
@@ -330,7 +330,7 @@
 /
 
 !-------------------------------------------------------------------------------
-! inflows 
+! inflows
 !-------------------------------------------------------------------------------
 !
 ! num_inflows number of inflowing streams