update version string and change log for 4.2.1

src/ChangeLog

@@ -25,6 +25,42 @@ Usage:
 
 
 
+-------------------------------------------------------------------------------
+***** Description of changes between VIC 4.2.0 and VIC 4.2.1 *****
+-------------------------------------------------------------------------------
+
+Bug Fixes:
+----------
+
+Fixed unitialized bare soil albedo.
+
+	Files Affected:
+
+	full_energy.c
+
+	Description:
+
+	Previously, bare_albedo was unset for the bare soil case (`iveg!=Nveg`).
+	This fix sets the bare_albedo to the global variable value of
+	`BARE_SOIL_ALBEDO`.
+
+
+
+Cleanup of frozen soil option constraints.
+
+	Files Affected:
+
+	calc_surf_energy_bal.c
+	get_global_param.c
+
+	Description:
+
+	Removed hardcoded, behind the scenes checks for the `EXP_TRANS` and
+	`NO_FLUX` global parameter values for case of `QUICK_SOLVE=TRUE` in
+	`calc_surf_energy_bal`.
+
+
+
 --------------------------------------------------------------------------------
 ***** Description of changes between VIC 4.1.2 and VIC 4.2 *****
 --------------------------------------------------------------------------------

src/global.h

@@ -22,7 +22,7 @@
   2013-Dec-27 Removed QUICK_FS option.					TJB
   2014-May-20 Added ref_veg_vegcover.					TJB
 **********************************************************************/
-char *version = "4.2.0 2014-November-19";
+char *version = "4.2.1 2014-December-21";
 char *optstring = "g:vo";
 int flag;