Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed a bug when read/write binary state file #487

Merged
merged 1 commit into from
Apr 29, 2016
+9 −9
Merged

Fixed a bug when read/write binary state file #487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion samples/data
Submodule data updated 1 files
+4 −5 classic/Stehekin/parameters/global_param.STEHE.txt
2 changes: 1 addition & 1 deletion vic/drivers/classic/include/vic_driver_classic.h
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ void init_output_list(out_data_struct *, int, char *, int, double);
void initialize_forcing_files(void);
void make_in_and_outfiles(filep_struct *, filenames_struct *, soil_con_struct *,
out_data_file_struct *);
FILE *open_state_file(global_param_struct *, filenames_struct, int, int);
FILE *open_state_file(global_param_struct *, filenames_struct, size_t, size_t);
void print_atmos_data(atmos_data_struct *atmos, size_t nr);
void parse_output_info(FILE *, out_data_file_struct **, out_data_struct *);
void read_atmos_data(FILE *, global_param_struct, int, int, double **,
4 changes: 2 additions & 2 deletions vic/drivers/classic/src/check_state_file.c
View file
Original file line number Diff line number Diff line change
@@ -69,8 +69,8 @@ check_state_file(char *init_state_name,

/* Check simulation options */
if (options.STATE_FORMAT == BINARY) {
fread(&tmp_Nlayer, sizeof(int), 1, init_state);
fread(&tmp_Nnodes, sizeof(int), 1, init_state);
fread(&tmp_Nlayer, sizeof(size_t), 1, init_state);
fread(&tmp_Nnodes, sizeof(size_t), 1, init_state);
}
else {
fscanf(init_state, "%zu %zu\n", &tmp_Nlayer, &tmp_Nnodes);
10 changes: 5 additions & 5 deletions vic/drivers/classic/src/open_state_file.c
View file
Original file line number Diff line number Diff line change
@@ -32,8 +32,8 @@
FILE *
open_state_file(global_param_struct *global,
filenames_struct filenames,
int Nlayer,
int Nnodes)
size_t Nlayer,
size_t Nnodes)
{
extern option_struct options;

@@ -62,11 +62,11 @@ open_state_file(global_param_struct *global,

/* Write simulation flags */
if (options.STATE_FORMAT == BINARY) {
fwrite(&Nlayer, sizeof(int), 1, statefile);
fwrite(&Nnodes, sizeof(int), 1, statefile);
fwrite(&Nlayer, sizeof(size_t), 1, statefile);
fwrite(&Nnodes, sizeof(size_t), 1, statefile);
}
else {
fprintf(statefile, "%i %i\n", Nlayer, Nnodes);
fprintf(statefile, "%zu %zu\n", Nlayer, Nnodes);
}

return(statefile);