Clean-up ascii header

[jhamman]

example of new header format:

# SIMULATION: ./test_fluxes_45.000_23.500.txt
# MODEL_VERSION: VIC.5.0.beta
# ALMA_UNITS: True
YEAR  MONTH   DAY SECOND  OUT_PREC     OUT_AIR_TEMP    OUT_SHORTWAVE   OUT_LONGWAVE    OUT_DENSITY     OUT_PRESSURE    OUT_VP  OUT_WIND

[bartnijssen]

Is there an issue that this pertains to? - this will break compatibility for anyone that has set up an automated processing stream assuming the old VIC files, so I assume there is an option to turn this on (or off)

[bartnijssen]

Is there a reason to remove existing fields like NVARS?

[jhamman]

won't fix.

[jhamman]

Issue is #204

[bartnijssen]

OK - thanks - then that just leave the line comments (no need to redo the discussion we already had on this - thx for including the issue number)

[bartnijssen]

Just say when the PR is complete and comment on the individual line comments with "won't fix" if you are not planning to change them.

[tbohn]

Just for backstory - the NVARS bit was for convenience, so a processing
program could know the number of columns without having to count them. But
it's technically redundant information, so no harm in removing it if you're
changing the format anyway.

Ted

On Fri, Jul 24, 2015 at 8:32 AM, Bart Nijssen notifications@github.com
wrote:

Just say when the PR is complete and comment on the individual line
comments with "won't fix" if you are not planning to change them.

—
Reply to this email directly or view it on GitHub
#227 (comment).

[jhamman]

This is ready to merge. Just to show the fully tested output:

Daily timestep

# SIMULATION: snow
# MODEL_VERSION: 5.0.beta
# ALMA_UNITS: False
YEAR    MONTH   DAY OUT_SWE  OUT_SNOW_DEPTH  OUT_SNOW_CANOPY     OUT_SNOW_COVER
1995    01  01  0.0000   0.0000  0.0000  0.0000
1995    01  02  0.0000   0.0000  0.0000  0.0000

Hourly timestep

# SIMULATION: fluxes
# MODEL_VERSION: 5.0.beta
# ALMA_UNITS: False
YEAR    MONTH   DAY SEC OUT_PREC     OUT_EVAP    OUT_RUNOFF  OUT_BASEFLOW    OUT_WDEW    OUT_SOIL_LIQ_0  OUT_SOIL_LIQ_1  OUT_SOIL_LIQ_2  OUT_NET_SHORT   OUT_R_NET   OUT_EVAP_CANOP  OUT_TRANSP_VEG  OUT_EVAP_BARE   OUT_SUB_CANOP   OUT_SUB_SNOW    OUT_AERO_RESIST     OUT_SURF_TEMP   OUT_ALBEDO  OUT_REL_HUMID   OUT_IN_LONG     OUT_AIR_TEMP    OUT_WIND
1995    01  01  00000   0.0000   0.0000  0.0000  0.0004  0.0000  0.3052  0.4063  0.4298  0.0605  -83.0820    0.0000  0.0000  0.0000  0.0000  0.0000  225380.4619     -0.0020     0.1200  0.0144  223.0164    -0.0020     0.0009
1995    01  01  03600   0.0000   0.0000  0.0000  0.0004  0.0000  0.3051  0.4054  0.4309  0.0662  -96.0021    0.0000  0.0000  0.0000  0.0000  0.0000  225475.3861     -0.0019     0.1200  0.0150  210.0912    -0.0019     0.0009

[bartnijssen]

@jhamman: Can you resolve the conflicts before I merge the PR?

[jhamman]

Okay - merge conflicts have been resolved.