Clean-up ascii header

vic/drivers/classic/src/write_header.c

@@ -327,19 +327,14 @@ write_header(out_data_file_struct *out_data_files,
             else {
                 Nvars += 3;
             }
-            fprintf(out_data_files[file_idx].fh, "# NRECS: %zu\n",
-                    global.nrecs);
-            fprintf(out_data_files[file_idx].fh, "# DT: %f\n", global.out_dt);
-            fprintf(out_data_files[file_idx].fh,
-                    "# STARTDATE: %04d-%02d-%02d-%05d\n",
-                    dmy->year, dmy->month, dmy->day, dmy->dayseconds);
-            fprintf(out_data_files[file_idx].fh, "# ALMA_OUTPUT: %d\n",
-                    tmp_ALMA_OUTPUT);
-            fprintf(out_data_files[file_idx].fh, "# NVARS: %zu\n", Nvars);
+            fprintf(out_data_files[file_idx].fh, "# SIMULATION: %s\n",
+                    out_data_files[file_idx].prefix);
+            fprintf(out_data_files[file_idx].fh, "# MODEL_VERSION: %s\n",
+                    SHORT_VERSION);
+            fprintf(out_data_files[file_idx].fh, "# ALMA_UNITS: %s\n",
+                    tmp_ALMA_OUTPUT ? "True" : "False");
 
             // Header part 2: Variables
-            fprintf(out_data_files[file_idx].fh, "# ");
-
             // Write the date
             if (global.out_dt < SEC_PER_DAY) {
                 // Write year, month, day, and sec

vic/drivers/shared/include/vic_driver_shared.h

@@ -31,7 +31,7 @@
 #include <vic_def.h>
 #include <vic_physical_constants.h>
 
-#define VERSION "5.0 beta 2014-Dec-03"
+#define VERSION "5.0 beta 2015-July-26"
 #define SHORT_VERSION "5.0.beta"
 
 /******************************************************************************
@@ -61,6 +61,38 @@ typedef struct {
     size_t N_TYPES[2];
 } param_set_struct;
 
+/******************************************************************************
+ * @brief   This structure stores output information for one output file.
+ *****************************************************************************/
+typedef struct {
+    char prefix[MAXSTRING];  /**< prefix of the file name, e.g. "fluxes" */
+    char filename[MAXSTRING];        /**< complete file name */
+    FILE *fh;                /**< filehandle */
+    size_t nvars;            /**< number of variables to store in the file */
+    unsigned int *varid;         /**< id numbers of the variables to store in the file
+                                    (a variable's id number is its index in the out_data array).
+                                    The order of the id numbers in the varid array
+                                    is the order in which the variables will be written. */
+} out_data_file_struct;
+
+/******************************************************************************
+ * @brief   This structure holds all variables needed for the error handling
+ *          routines.
+ *****************************************************************************/
+typedef struct {
+    atmos_data_struct *atmos;
+    double dt;
+    energy_bal_struct *energy;
+    filep_struct filep;
+    size_t rec;
+    out_data_struct *out_data;
+    out_data_file_struct *out_data_files;
+    snow_data_struct *snow;
+    soil_con_struct soil_con;
+    veg_con_struct *veg_con;
+    veg_var_struct *veg_var;
+} Error_struct;
+
 double all_30_day_from_dmy(dmy_struct *dmy);
 double all_leap_from_dmy(dmy_struct *dmy);
 void calc_root_fractions(veg_con_struct *veg_con, soil_con_struct *soil_con);

vic/vic_run/include/vic_def.h

@@ -1504,36 +1504,4 @@ typedef struct {
     double *aggdata;         /**< array of aggregated data values */
 } out_data_struct;
 
-/******************************************************************************
- * @brief   This structure stores output information for one output file.
- *****************************************************************************/
-typedef struct {
-    char prefix[20];         /**< prefix of the file name, e.g. "fluxes" */
-    char filename[MAXSTRING];        /**< complete file name */
-    FILE *fh;                /**< filehandle */
-    size_t nvars;            /**< number of variables to store in the file */
-    unsigned int *varid;         /**< id numbers of the variables to store in the file
-                                    (a variable's id number is its index in the out_data array).
-                                    The order of the id numbers in the varid array
-                                    is the order in which the variables will be written. */
-} out_data_file_struct;
-
-/******************************************************************************
- * @brief   This structure holds all variables needed for the error handling
- *          routines.
- *****************************************************************************/
-typedef struct {
-    atmos_data_struct *atmos;
-    double dt;
-    energy_bal_struct *energy;
-    filep_struct filep;
-    size_t rec;
-    out_data_struct *out_data;
-    out_data_file_struct *out_data_files;
-    snow_data_struct *snow;
-    soil_con_struct soil_con;
-    veg_con_struct *veg_con;
-    veg_var_struct *veg_var;
-} Error_struct;
-
 #endif