tbohn
commented
10 years ago I'm fine with stripping out the comments documenting the changes. Some of the files have very long comment sections at the top, and it is unwieldy to keep them. A disadvantage would be that someone looking at the files outside of git will not have access to comments. But probably most people looking at the code in that level of detail are also using git to access the code.
Ted
On Fri, Mar 28, 2014 at 2:16 PM, bartnijssen notifications@github.comwrote:
Much of the VIC code has comment blocks at the top that contain the information that basically is the same (or similar) to what would be in a commit message. For example, the header in global.h states
2003-Oct-29 Added version string and removed unused options from optstring. TJB 2009-Jun-09 Added definitions of reference landcover types, used mainly for pot_evap computations but also defines the characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN 2013-Dec-27 Removed QUICK_FS option. TJB
The question is whether we want to maintain those (and keep adding going forward) or whether we strip them all and will rely on git commit messages instead. This has some disadvantages, since the commit message may not be detailed about a change to a particular file (instead referring to changes to a large number of files). On the other hand, you can quickly get a listing of the actual changes that are made to the file and we are not relying on people actually adding the line (see at the bottom of this issue for an example for the same file).
If we decide not to go forward with putting the changes in the header, I'd prefer to strip them all as part of the code reformat for VIC5 (since having only some of them in there would be misleading).
Output from git log --follow -p global.h (note that the --follow makes sure that any name changes (including moves) are traced. Unfortunately, this is not what you get if you look at the history of a single file on github, which does not show the history beyond a move or rename: https://github.com/UW-Hydro/VIC/commits/master/src/global.h).
commit b2da877a1a91eaed6e8684c34b29690aba2546f7 Author: Bart Nijssen nijssen@uw.edu Date: Tue Mar 25 15:33:12 2014 -0700
Initial code move to vic_run and driver directoriesdiff --git a/src/global.h b/vic_run/include/global.h similarity index 100% rename from src/global.h rename to vic_run/include/global.h
commit 1e30452694b2297cff251bbb171eaa2203a51d74 Author: Ted Bohn ted.j.bohn@gmail.com Date: Sun Feb 9 17:42:38 2014 -0800
Updates for VIC 4.1.2.k.diff --git a/src/global.h b/src/global.h index 9433093..dec13c9 100644 --- a/src/global.h +++ b/src/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.j bug fix update 2013-Dec-01"; +char version = "4.1.2.k bug fix update 2014-Feb-01";
char *optstring = "g:vo";
commit ec458ae715f282600a37671f3a46e47a24517b32 Author: Ted Bohn ted.j.bohn@gmail.com Date: Tue Dec 31 17:50:28 2013 -0800
Removed QUICK_FS option.diff --git a/src/global.h b/src/global.h index 7798173..f688fc0 100644 --- a/src/global.h +++ b/src/global.h @@ -19,15 +19,10 @@ mainly for pot_evap computations but also defines the characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN
2013-Dec-27 Removed QUICK_FS option. TJB **/
char *version = "4.2 beta 2013-Dec-26";
char *optstring = "g:vo";
-#if QUICK_FS -double temps[] = { -1.e-5, -0.075, -0.20, -0.50, -1.00, -2.50, -5, -10 };
-#endif
int flag;
global_param_struct global_param;
commit d23e6916acce14b716ff36ffd2917b9b2dfc0c32 Author: Ted Bohn ted.j.bohn@gmail.com Date: Thu Dec 26 16:22:04 2013 -0800
Updated release string in global.h to reflect development branch.diff --git a/src/global.h b/src/global.h index ecd7ac7..7798173 100644 --- a/src/global.h +++ b/src/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2_wetcarb 2013-Jul-25"; +char version = "4.2 beta 2013-Dec-26";
char *optstring = "g:vo";
commit bdb836e7c2020db6d054006e4730ca698568f9ca Author: Ted Bohn ted.j.bohn@gmail.com Date: Thu Nov 21 13:39:52 2013 -0800
Fixed two bugs: 1. Fixed incorrect starting forcing record when STARTHOUR != 0 2. Fixed incorrect disaggregation of moisture fluxes (e.g., precipitation) when ALMA_INPUT == TRUEdiff --git a/src/global.h b/src/global.h index 9106379..9433093 100644 --- a/src/global.h +++ b/src/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.i bug fix update 2013-Sep-01"; +char version = "4.1.2.j bug fix update 2013-Dec-01";
char *optstring = "g:vo";
commit fa492a034896da3859ae6005253f97fedc93cdc6 Author: Ted Bohn ted.j.bohn@gmail.com Date: Tue Aug 13 16:28:10 2013 -0700
Added simulation of photosynthesis. The photosynthesis formulation was taken from the BETHY model (Knorr, 2000), which in turn used the Farquhar model for C3 plants and the Collatz model for C4 plants. In addition, inhibition of photosynthesis under saturated conditions (as described by Frolking et al, 2002) is allowed for. This feature requires several new veg parameters to be in the veg library file: Ctype: Photosynthetic pathway; can be C3 or C4 MaxCarboxRate: Maximum carboxlyation rate at 25 deg C (mol(CO2)/m2s) MaxETransport: Maximum electron transport rate at 25 deg C (mol(CO2)/m2s) (C3 plants) CO2Specificity: CO2 specificity at 25 deg C (mol(CO2)/m2s) (C4 plants) LightUseEff: Light-use efficiency (mol(CO2)/mol(photons)) NscaleFlag: TRUE = nitrogen-scaling factors are applicable to this veg class Wnpp_inhib: Moisture level (fraction of maximum moisture) above which photosynthesis experiencing saturation inhibition, i.e. too wet for optimal photosynthesis; only applies to top soil layer NPPfactor_sat: Photosynthesis multiplier (fraction of maximum) when top soil layer is saturated There are several new output variables associated with this feature: OUT_GPP: Gross primary productivity [g C/m2d] OUT_RAUT: Autotrophic respiration [g C/m2d] OUT_NPP: Net primary productivity [g C/m2d] OUT_APAR: Absorbed PAR [W/m2] By default, this feature is turned off. To turn this feature on, set CARBON to TRUE in the global parameter file. When this feature is turned on, you can choose to compute stomatal resistance via the Jarvis formulation (the formulation used by all previous versions of VIC) or as a function of photosynthetic demand. This is determined by the setting of RC_MODE in the global parameter file. A value of RC_JARVIS (which is the default) selects the Jarvis formulation. A value of RC_PHOTO selects the photosynthetic demand formulation.diff --git a/src/global.h b/src/global.h index 96cd9a3..ecd7ac7 100644 --- a/src/global.h +++ b/src/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.h bug fix update 2013-Aug-01"; +char version = "4.1.2_wetcarb 2013-Jul-25";
char *optstring = "g:vo";
commit 91e57b61be4ea4d0106853bbb32a4cb27beee628 Author: Ted Bohn ted.j.bohn@gmail.com Date: Wed Aug 14 13:20:35 2013 -0700
Fixed 2 bugs: 1. Fixed incorrect handling of case of a mix of cells with and without lakes in a single lake parameter file. 2. Fixed use of tmp_moist array without initialization.diff --git a/src/global.h b/src/global.h index 96cd9a3..9106379 100644 --- a/src/global.h +++ b/src/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.h bug fix update 2013-Aug-01"; +char version = "4.1.2.i bug fix update 2013-Sep-01";
char *optstring = "g:vo";
commit bb393c77162880542b4c582485889b7c4823c9e1 Author: Ted Bohn tbohn@ponic.hydro.washington.edu Date: Fri Jul 19 18:44:26 2013 -0700
Updates for release of hotfix/VIC_4.1.2.h: src/output_list_utils.c: moved from samples/ to src/ where it belongs. src/initialize_atmos.c: Homero's original fix turned out to have an error, which I fixed. src/calc_root_fraction.c, src/mtclim_vic.c, src/mtclim_wrapper.c: added comments describing modifications; not sure if this is necessary anymore but did it just to be safe and consistent with past practices. src/global.h: Updated release version string.diff --git a/src/global.h b/src/global.h index f381997..96cd9a3 100644 --- a/src/global.h +++ b/src/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.g bug fix update 2013-Feb-01"; +char version = "4.1.2.h bug fix update 2013-Aug-01";
char *optstring = "g:vo";
commit dcff0b829e6bee5c7f472fbe01658392f2c03bc7 Author: Joe Hamman jhamman@hydro.washington.edu Date: Wed May 8 17:23:18 2013 -0700
Changes to directory structure in git repository, also added git tools directorydiff --git a/global.h b/src/global.h similarity index 100% rename from global.h rename to src/global.h
commit cf69e6a9ad553fbdc4e3868c867d309665447710 Author: vicadmin vicadmin@hydro.washington.edu Date: Fri Jan 11 20:39:49 2013 +0000
Fixed errors in passing SensibleHeat to func_atmos_energy_bal.diff --git a/global.h b/global.h index 412bd7a..f381997 100644 --- a/global.h +++ b/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.f bug fix update 2013-Jan-08"; +char version = "4.1.2.g bug fix update 2013-Feb-01";
char *optstring = "g:vo";
commit b3dd41ebd28c22b385a0a1055afbb774833d496a Author: vicadmin vicadmin@hydro.washington.edu Date: Tue Jan 8 16:55:50 2013 +0000
Bug fixes for 4.1.2.f.diff --git a/global.h b/global.h index 1e629bb..412bd7a 100644 --- a/global.h +++ b/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.e bug fix update 2012-Nov-01"; +char version = "4.1.2.f bug fix update 2013-Jan-08";
char *optstring = "g:vo";
commit 2bdd2bab2425aef5cb4d9fd4eff801d1d61402d7 Author: vicadmin vicadmin@hydro.washington.edu Date: Thu Oct 25 23:15:58 2012 +0000
Fixed incorrect reporting of canopy energy balance terms.diff --git a/global.h b/global.h index 867f2ac..1e629bb 100644 --- a/global.h +++ b/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.d bug fix update 2012-Sep-01"; +char version = "4.1.2.e bug fix update 2012-Nov-01";
char *optstring = "g:vo";
commit a2cbd9e09efd7d348d3879ba821701b0ab3fdf0b Author: vicadmin vicadmin@hydro.washington.edu Date: Wed Aug 29 00:21:00 2012 +0000
Updated for new release.diff --git a/global.h b/global.h index 5055ad6..867f2ac 100644 --- a/global.h +++ b/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.c bug fix update 2012-May-01"; +char version = "4.1.2.d bug fix update 2012-Sep-01";
char *optstring = "g:vo";
commit 3f334d25f001690bc8d0900bdba1decdaddb4521 Author: vicadmin vicadmin@hydro.washington.edu Date: Mon Apr 30 22:29:54 2012 +0000
Updated version string.diff --git a/global.h b/global.h index b615fd7..5055ad6 100644 --- a/global.h +++ b/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.b bug fix update 2012-Apr-01"; +char version = "4.1.2.c bug fix update 2012-May-01";
char *optstring = "g:vo";
commit 563febdade0a7c6f9230c0175cd80650eaa82f8c Author: vicadmin vicadmin@hydro.washington.edu Date: Fri Mar 30 02:53:34 2012 +0000
Moved tskc computation to a location where it can access observed shortwave (if available).diff --git a/global.h b/global.h index 30df57e..b615fd7 100644 --- a/global.h +++ b/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2.a bug fix update 2012-Mar-01"; +char version = "4.1.2.b bug fix update 2012-Apr-01";
char *optstring = "g:vo";
commit 57b26c18046d10d82a518c572e368d28886d2d87 Author: vicadmin vicadmin@hydro.washington.edu Date: Thu Feb 16 22:59:32 2012 +0000
Fixed typo in version string.diff --git a/global.h b/global.h index b6d81e6..30df57e 100644 --- a/global.h +++ b/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2a bug fix update 2012-Mar-01"; +char version = "4.1.2.a bug fix update 2012-Mar-01";
char *optstring = "g:vo";
commit 4ed5648c2cca7c396b25e4bb772d91f4a5d6b045 Author: vicadmin vicadmin@hydro.washington.edu Date: Thu Feb 16 22:41:12 2012 +0000
Fixes for bugs in forcing disaggregation.diff --git a/global.h b/global.h index 5f8f603..b6d81e6 100644 --- a/global.h +++ b/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2 final release 2012-Feb-08"; +char version = "4.1.2a bug fix update 2012-Mar-01";
char *optstring = "g:vo";
commit f8a04484a782421be66d6c86309e578efce636ed Author: vicadmin vicadmin@hydro.washington.edu Date: Thu Feb 9 01:57:35 2012 +0000
Updated version string for 4.1.2 release.diff --git a/global.h b/global.h index 01e17cd..5f8f603 100644 --- a/global.h +++ b/global.h @@ -20,7 +20,7 @@ characteristics of bare soil. TJB 2012-Jan-16 Removed LINK_DEBUG code BN **/ -char version = "4.1.2 beta 1"; +char version = "4.1.2 final release 2012-Feb-08";
char *optstring = "g:vo";
commit 74c7725962d79a668f179a64b1a5d7b40a101fff Author: vicadmin vicadmin@hydro.washington.edu Date: Sun Feb 5 00:15:44 2012 +0000
Removed LINK_DEBUG option.diff --git a/global.h b/global.h index 1e8dcbf..01e17cd 100644 --- a/global.h +++ b/global.h @@ -13,11 +13,12 @@
$Id$
- 29-Oct-03 Added version string and removed unused options from
- optstring. TJB
- 2003-Oct-29 Added version string and removed unused options from
- optstring. TJB 2009-Jun-09 Added definitions of reference landcover types, used mainly for pot_evap computations but also defines the characteristics of bare soil. TJB
- 2012-Jan-16 Removed LINK_DEBUG code BN **/ char *version = "4.1.2 beta 1";
@@ -32,9 +33,6 @@ int flag; global_param_struct global_param; veg_lib_struct *veg_lib; option_struct options; -#if LINK_DEBUG -debug_struct debug; -#endif Error_struct Error; param_set_struct param_set;
commit f8e8ada759ca7cdf03928550909d6dff37857e9e Author: vicadmin vicadmin@hydro.washington.edu Date: Thu Nov 12 01:54:07 2009 +0000
Fixed typo.diff --git a/global.h b/global.h index 59b46ea..1e8dcbf 100644 --- a/global.h +++ b/global.h @@ -19,7 +19,7 @@ mainly for pot_evap computations but also defines the characteristics of bare soil. TJB **/ -char version = "4.1.2 beta"; +char version = "4.1.2 beta 1";
char *optstring = "g:vo";
commit 2bb91df6a1b3abc8d976237fbe52648d34edae48 Author: vicadmin vicadmin@hydro.washington.edu Date: Thu Nov 12 01:53:16 2009 +0000
Updated release string to reflect current status as 4.1.2 beta.diff --git a/global.h b/global.h index 20ec7e8..59b46ea 100644 --- a/global.h +++ b/global.h @@ -19,7 +19,7 @@ mainly for pot_evap computations but also defines the characteristics of bare soil. TJB **/ -char version = "4.1.1"; +char version = "4.1.2 beta";
char *optstring = "g:vo";
commit bbd5b7ab54bf4cb60f6e05fed165c5e32a4ce04c Author: vicadmin vicadmin@hydro.washington.edu Date: Tue Oct 20 18:42:07 2009 +0000
Updated version string for 4.1.1 release.diff --git a/global.h b/global.h index 3089936..20ec7e8 100644 --- a/global.h +++ b/global.h @@ -19,7 +19,7 @@ mainly for pot_evap computations but also defines the characteristics of bare soil. TJB **/ -char version = "4.1.1 beta 1"; +char version = "4.1.1";
char *optstring = "g:vo";
commit ffeb7023223487c58c2116ba464aa46e45e2c0b0 Author: vicadmin vicadmin@hydro.washington.edu Date: Mon Jul 27 18:17:03 2009 +0000
Fixed the wind_h values for bare soil and other non-veg-lib veg types.diff --git a/global.h b/global.h index 7a19a79..3089936 100644 --- a/global.h +++ b/global.h @@ -51,7 +51,8 @@ param_set_struct param_set; vegnocr = current vegetation with canopy resistance set to 0 NOTE: these are external variables, declared in vicNl_def.h. NOTE2: bare soil roughness and displacement will be overwritten by the
- values found in the soil parameter file
- values found in the soil parameter file; bare soil wind_h will
be overwritten by the value specified in the global param file.**/
/* One element for each non-natural PET type */ @@ -62,7 +63,7 @@ param_set_struct param_set; double ref_veg_albedo[] = { BARE_SOIL_ALBEDO, H2O_SURF_ALBEDO, 0.23, 0.23 }; double ref_veg_rough[] = { 0.001, 0.001, 0.0148, 0.0615 }; double ref_veg_displ[] = { 0.0054, 0.0054, 0.08, 0.3333 };
- double ref_veg_wind_h[] = { 0.0, 0.0, 0.0, 0.0 };
- double ref_veg_wind_h[] = { 10.0, 10.0, 10.0, 10.0 }; double ref_veg_RGL[] = { 0.0, 0.0, 100, 100 }; double ref_veg_rad_atten[] = { 0.0, 0.0, 0.0, 0.0 }; double ref_veg_wind_atten[] = { 0.0, 0.0, 0.0, 0.0 };
commit 04d9f512bf7ae3442ade06a8d0ffb18589b492bf Author: vicadmin vicadmin@hydro.washington.edu Date: Tue Jun 9 09:54:11 2009 +0000
Added computation of 6 different types of potential evap.diff --git a/global.h b/global.h index 8414465..7a19a79 100644 --- a/global.h +++ b/global.h @@ -1,10 +1,23 @@ /** Global Variables
- NOTE: This file exists because global variables that are shared among
- files via the "extern" statement must be initially declared
- (without the word "extern") ONLY once. Currently, vicNl_def.h
- is included (via vicNl.h) in every .c file, meaning that any
- declarations in vicNl_def.h end up happening multiple times
- (once per .c file). Thus, these "extern" variables cannot be
- declared in vicNl_def.h. This is not a problem for #define
- statements and typedef statements, which is what vicNl_def.h
is primarily composed of.+ $Id$
29-Oct-03 Added version string and removed unused options from
- optstring. TJB
- optstring. TJB
- 2009-Jun-09 Added definitions of reference landcover types, used
- mainly for pot_evap computations but also defines the
- characteristics of bare soil. TJB **/ char *version = "4.1.1 beta 1";
@@ -24,3 +37,36 @@ debug_struct debug;
endif
Error_struct Error; param_set_struct param_set; +
- /**
- Define some reference landcover types that always exist regardless
- of the contents of the library (mainly for potential evap calculations):
- Non-natural:
- satsoil = saturated bare soil
- h2osurf = open water surface (deep enough to have albedo of 0.08)
- short = short reference crop (grass)
- tall = tall reference crop (alfalfa)
- Natural:
- natveg = current vegetation
- vegnocr = current vegetation with canopy resistance set to 0
- NOTE: these are external variables, declared in vicNl_def.h.
- NOTE2: bare soil roughness and displacement will be overwritten by the
- values found in the soil parameter file
- **/ +
- /* One element for each non-natural PET type */
- char ref_veg_over[] = { 0, 0, 0, 0 };
- double ref_veg_rarc[] = { 0.0, 0.0, 25, 25 };
- double ref_veg_rmin[] = { 0.0, 0.0, 100, 100 };
- double ref_veg_lai[] = { 1.0, 1.0, 2.88, 4.45 };
- double ref_veg_albedo[] = { BARE_SOIL_ALBEDO, H2O_SURF_ALBEDO, 0.23, 0.23 };
- double ref_veg_rough[] = { 0.001, 0.001, 0.0148, 0.0615 };
- double ref_veg_displ[] = { 0.0054, 0.0054, 0.08, 0.3333 };
- double ref_veg_wind_h[] = { 0.0, 0.0, 0.0, 0.0 };
- double ref_veg_RGL[] = { 0.0, 0.0, 100, 100 };
- double ref_veg_rad_atten[] = { 0.0, 0.0, 0.0, 0.0 };
- double ref_veg_wind_atten[] = { 0.0, 0.0, 0.0, 0.0 };
- double ref_veg_trunk_ratio[] = { 0.0, 0.0, 0.0, 0.0 };
- /* One element for each PET type (non-natural or natural) */
- char ref_veg_ref_crop[] = { FALSE, FALSE, TRUE, TRUE, FALSE, FALSE }; +
commit 45785595f0b7c342954c236567482fa360db4703 Author: vicadmin vicadmin@hydro.washington.edu Date: Wed May 20 06:52:40 2009 +0000
Moved version string back to "4.1.1 beta 1". Had moved it to "4.1.1" too early.diff --git a/global.h b/global.h index 9f29a22..8414465 100644 --- a/global.h +++ b/global.h @@ -6,7 +6,7 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "4.1.1"; +char version = "4.1.1 beta 1";
char *optstring = "g:vo";
commit ab607457cc46659423b70254afaf880ce9c76d88 Author: vicadmin vicadmin@hydro.washington.edu Date: Wed May 20 02:05:18 2009 +0000
Added entries for MIN_LIQ and PLAPSE options.diff --git a/global.h b/global.h index 8414465..9f29a22 100644 --- a/global.h +++ b/global.h @@ -6,7 +6,7 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "4.1.1 beta 1"; +char version = "4.1.1";
char *optstring = "g:vo";
commit abe987653d6b16aed0422bbb925f3c3209ca21ed Author: vicadmin vicadmin@hydro.washington.edu Date: Tue Jan 13 06:05:45 2009 +0000
Changed version string to denote beta version of 4.1.1.diff --git a/global.h b/global.h index 9f29a22..8414465 100644 --- a/global.h +++ b/global.h @@ -6,7 +6,7 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "4.1.1"; +char version = "4.1.1 beta 1";
char *optstring = "g:vo";
commit 73d910dea5ac76bf5982fe08d46ccf1b13674bf8 Author: vicadmin vicadmin@hydro.washington.edu Date: Tue Jan 13 06:03:14 2009 +0000
Establishing new release: VIC 4.1.1.diff --git a/global.h b/global.h index e26174c..9f29a22 100644 --- a/global.h +++ b/global.h @@ -6,7 +6,7 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "4.1.0 Beta Release 5"; +char version = "4.1.1";
char *optstring = "g:vo";
commit 9b3aaaa26aa99d8f43c681ae094982c81c1e08bd Author: vicadmin vicadmin@hydro.washington.edu Date: Fri Oct 26 22:39:13 2007 +0000
Allow lakes to be empty or very shallow.diff --git a/global.h b/global.h index 3aa83ed..e26174c 100644 --- a/global.h +++ b/global.h @@ -6,7 +6,7 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "4.1.0 Beta Release 4"; +char version = "4.1.0 Beta Release 5";
char *optstring = "g:vo";
commit 86d2ad7b20be70518e225becc56d4c6e7c2823a8 Author: vicadmin vicadmin@hydro.washington.edu Date: Wed Sep 27 18:53:54 2006 +0000
Flexible output configuration & aggregation of output variables. See README.txt for additional details.diff --git a/global.h b/global.h index 77933c8..3aa83ed 100644 --- a/global.h +++ b/global.h @@ -6,7 +6,7 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "4.1.0 Beta Release 3"; +char version = "4.1.0 Beta Release 4";
char *optstring = "g:vo";
commit db92d94830416dcb2e371043d79a12dda608c205 Author: vicadmin vicadmin@hydro.washington.edu Date: Tue Oct 19 02:01:59 2004 +0000
Updated release string to VIC 4.1.0 beta 3.diff --git a/global.h b/global.h index 6022d7d..77933c8 100644 --- a/global.h +++ b/global.h @@ -6,7 +6,7 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "4.1.0 Beta Release 2"; +char version = "4.1.0 Beta Release 3";
char *optstring = "g:vo";
commit b47007901824c9e1667661e2768881b07742f920 Author: vicadmin vicadmin@hydro.washington.edu Date: Tue Oct 5 01:10:56 2004 +0000
Moved back to 4.1.0 beta release 2.diff --git a/global.h b/global.h index 77933c8..6022d7d 100644 --- a/global.h +++ b/global.h @@ -6,7 +6,7 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "4.1.0 Beta Release 3"; +char version = "4.1.0 Beta Release 2";
char *optstring = "g:vo";
commit a691dae3fd4cd2c1cdbeeffaf892356979ebb07a Author: vicadmin vicadmin@hydro.washington.edu Date: Mon Oct 4 22:31:11 2004 +0000
Updated to reflect 4.1.0_r3.diff --git a/global.h b/global.h index 6022d7d..77933c8 100644 --- a/global.h +++ b/global.h @@ -6,7 +6,7 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "4.1.0 Beta Release 2"; +char version = "4.1.0 Beta Release 3";
char *optstring = "g:vo";
commit 38087c285975ae2259f567747b2cbd24c413a44d Author: tbohn <> Date: Tue May 11 20:11:36 2004 +0000
Corrections to version string and compile/run-time options display.diff --git a/global.h b/global.h index 341ad53..6022d7d 100644 --- a/global.h +++ b/global.h @@ -6,7 +6,7 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "4.1.0"; +char version = "4.1.0 Beta Release 2";
char *optstring = "g:vo";
commit e4d33251c9f6b57882c21d211c6117c82977b710 Author: tbohn <> Date: Thu May 6 22:29:43 2004 +0000
Added RCS Id Strings.diff --git a/global.h b/global.h index 1622c19..341ad53 100644 --- a/global.h +++ b/global.h @@ -1,6 +1,8 @@ /** Global Variables
- $Id$ + 29-Oct-03 Added version string and removed unused options from optstring. TJB **/
commit d95b31955b890a50c15969ac17a1314a1ada549d Author: tbohn <> Date: Mon Nov 24 00:34:24 2003 +0000
Added -o command-line argument, which displays the compile_time (user_def.h) options which the executable was compiled with.diff --git a/global.h b/global.h index 3cec81e..1622c19 100644 --- a/global.h +++ b/global.h @@ -4,9 +4,9 @@ 29-Oct-03 Added version string and removed unused options from optstring. TJB **/ -char version = "VIC Release 4.1.0"; +char version = "4.1.0";
-char optstring = "g:v"; +char optstring = "g:vo";
if QUICK_FS
double temps[] = { -1.e-5, -0.075, -0.20, -0.50, -1.00, -2.50, -5, -10 };
commit 7412b0f0688a92c971896e2e55f1df12f32b02f4 Author: tbohn <> Date: Thu Oct 30 15:58:15 2003 +0000
Added version string and removed unused options from optstring.diff --git a/global.h b/global.h index be64522..3cec81e 100644 --- a/global.h +++ b/global.h @@ -1,7 +1,12 @@ /** Global Variables +
- 29-Oct-03 Added version string and removed unused options from
optstring. TJB**/ -char optstring = "i:o:g:r:s:v:L:a:D:d:I:S:EFCHpmP:"; +char version = "VIC Release 4.1.0"; + +char *optstring = "g:v";
if QUICK_FS
double temps[] = { -1.e-5, -0.075, -0.20, -0.50, -1.00, -2.50, -5, -10 };
commit ece940caec2e0238ca39b9c6b5106f6e4123b4d0 Author: vicadmin vicadmin@hydro.washington.edu Date: Tue May 16 21:07:16 2000 +0000
Release version 4.0 includes new radiation estimation routines, simplified frozen soil algorithm, unified core model, and forcing file format control in the global control file.diff --git a/global.h b/global.h index 85f7a65..be64522 100644 --- a/global.h +++ b/global.h @@ -4,13 +4,16 @@ char *optstring = "i:o:g:r:s:v:L:a:D:d:I:S:EFCHpmP:";
if QUICK_FS
-double temps[] = { -1.e-5, -0.075, -0.20, -0.50, -1.00, -2.50 }; +double temps[] = { -1.e-5, -0.075, -0.20, -0.50, -1.00, -2.50, -5, -10 };
endif
int flag;
+global_param_struct global_param; veg_lib_struct *veg_lib; option_struct options; +#if LINK_DEBUG debug_struct debug; +#endif Error_struct Error; param_set_struct param_set;
commit a97f85cb457437cae78244b88e2d5554b9226ada Author: vicadmin vicadmin@hydro.washington.edu Date: Wed Jul 7 16:32:12 1999 +0000
removed pow() function calls added system of linear equations as a quick solution for ufwcdiff --git a/global.h b/global.h index 02be0a9..85f7a65 100644 --- a/global.h +++ b/global.h @@ -3,6 +3,10 @@ **/ char *optstring = "i:o:g:r:s:v:L:a:D:d:I:S:EFCHpmP:";
+#if QUICK_FS +double temps[] = { -1.e-5, -0.075, -0.20, -0.50, -1.00, -2.50 }; +#endif + int flag;
veg_lib_struct *veg_lib;
commit dd28a8f95335295a45606f359b32af304475cd6a Author: cherkaue <> Date: Sun Apr 12 17:42:19 1998 +0000
Initial revisiondiff --git a/global.h b/global.h new file mode 100644 index 0000000..02be0a9 --- /dev/null +++ b/global.h @@ -0,0 +1,12 @@ +/**
- Global Variables +**/ +char optstring = "i:o:g:r:s:v:L:a:D:d:I:S:EFCHpmP:"; + +int flag; + +veg_lib_struct veg_lib; +option_struct options; +debug_struct debug; +Error_struct Error; +param_set_struct param_set;
Reply to this email directly or view it on GitHubhttps://github.com/UW-Hydro/VIC/issues/105 .
bartnijssen
jhamman
Much of the VIC code has comment blocks at the top that contain the information that basically is the same (or similar) to what would be in a commit message. For example, the header in global.h states
The question is whether we want to maintain those (and keep adding going forward) or whether we strip them all and will rely on git commit messages instead. This has some disadvantages, since the commit message may not be detailed about a change to a particular file (instead referring to changes to a large number of files). On the other hand, you can quickly get a listing of the actual changes that are made to the file and we are not relying on people actually adding the line (see at the bottom of this issue for an example for the same file).
If we decide not to go forward with putting the changes in the header, I'd prefer to strip them all as part of the code reformat for VIC5 (since having only some of them in there would be misleading).
Output from
git log --follow -p global.h(note that the--followmakes sure that any name changes (including moves) are traced. Unfortunately, this is not what you get if you look at the history of a single file on github, which does not show the history beyond a move or rename: https://github.com/UW-Hydro/VIC/commits/master/src/global.h).