updates for rc2 tomorrow (#585)

* updates for rc2 tomorrow * run uncrustify
UW-Hydro · Aug 18, 2016 · f3ac38d · f3ac38d
1 parent c06f38f
commit f3ac38d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/docs/Development/ReleaseNotes.md b/docs/Development/ReleaseNotes.md
@@ -15,9 +15,9 @@ For VIC 5 and later, type `vic _{classic,image}.exe -v`
 
 ------------------------------
 
-## VIC 5.0.0 (Release Candidate 1)
+## VIC 5.0.0 (Release Candidate 2)
 
-**Release date: June 28, 2016**
+**Release date: August 18, 2016**
 
 This is a major update from VIC 4. The VIC 5.0.0 release aims to have nearly identical physics as VIC 4.2 while providing a clean, refactored code base supporting multiple drivers. There are a number of new features, bug fixes, and backward incompatible changes. See the VIC Github page for more details on the changes included in this release.
 
@@ -60,7 +60,7 @@ This is a major update from VIC 4. The VIC 5.0.0 release aims to have nearly ide
 
 9. Tests Datasets ([GH#79](https://github.com/UW-Hydro/VIC/issues/79))
 
-	**TODO:** See https://github.com/UW-Hydro/VIC/issues/79 for more information.
+	See https://github.com/UW-Hydro/VIC/issues/79 for more information. A temporary location of the test data is here: ftp://ftp.hydro.washington.edu/pub/gergel/VIC5_test_data/
 
 10. Testing and Continuous Integration ([GH#190](https://github.com/UW-Hydro/VIC/pull/190))
 
@@ -76,7 +76,6 @@ This is a major update from VIC 4. The VIC 5.0.0 release aims to have nearly ide
 
 	The format of ASCII forcing and output files has changed in VIC 5. These changes were motivated by the desire to improve simulation metadata tracking and reproducibility of VIC simulations.
 
-	- Forcing files now require date stamps for each timestep and a header specifies the names of the forcing variables.   
 	- Output files now include a header with simulation metadata and variable names. The `PRT_HEADER` option has been deprecated.
 
 2.  Classic Driver Global Parameter Options

diff --git a/vic/drivers/python/setup.py b/vic/drivers/python/setup.py
@@ -28,7 +28,7 @@
 MICRO = 0
 ISRELEASED = True
 VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
-QUALIFIER = 'rc1'
+QUALIFIER = 'rc2'
 
 FULLVERSION = VERSION
 write_version = False

diff --git a/vic/drivers/shared_all/include/vic_version.h b/vic/drivers/shared_all/include/vic_version.h
@@ -31,11 +31,11 @@
 #define STR(x) STR_HELPER(x)
 
 #ifndef VERSION
-#define VERSION "5.0.0 Release Candidate 1: June 28, 2016"
+#define VERSION "5.0.0 Release Candidate 2: August 18, 2016"
 #endif
 
 #ifndef SHORT_VERSION
-#define SHORT_VERSION "5.0.0.rc1"
+#define SHORT_VERSION "5.0.0.rc2"
 #endif
 
 #ifndef GIT_VERSION

diff --git a/vic/vic_run/src/ice_melt.c b/vic/vic_run/src/ice_melt.c
@@ -509,9 +509,9 @@ ice_melt(double            z2,
             PackCC =
                 (PackSwq +
                  PackIce) * CONST_VCPICE_WQ * snow->pack_temp +
-                 PackRefreezeEnergy;
+                PackRefreezeEnergy;
             snow->pack_temp = PackCC / (CONST_VCPICE_WQ *
-                              (PackSwq + PackIce));
+                                        (PackSwq + PackIce));
             if (snow->pack_temp > 0.) {
                 snow->pack_temp = 0.;
             }
@@ -568,7 +568,7 @@ ice_melt(double            z2,
             SurfaceSwq += param.SNOW_MAX_SURFACE_SWE - SurfaceSwq;
         }
         snow->pack_temp = PackCC / (CONST_VCPICE_WQ *
-                          (PackSwq + PackIce));
+                                    (PackSwq + PackIce));
         snow->surf_temp = SurfaceCC / (CONST_VCPICE_WQ * SurfaceSwq);
     }
     else {