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.

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

specify netcdf variable names in global parameter file #379

Merged
merged 1 commit into from
Feb 19, 2016
Merged

specify netcdf variable names in global parameter file #379

merged 1 commit into from
Feb 19, 2016

Conversation

jhamman
Copy link
Member

@jhamman jhamman commented Jan 31, 2016

This PR closes #211. Forcing variables can be specified in the global parameter following the convention proposed in #211.

blocked by #378

@jhamman jhamman added this to the 5.0 milestone Jan 31, 2016
@jhamman jhamman self-assigned this Jan 31, 2016
@jhamman
Copy link
Member Author

jhamman commented Feb 1, 2016

This is ready for a review from @bartnijssen or @tbohn, although it may be easier to wait until after #378 is merged.

@jhamman
Copy link
Member Author

jhamman commented Feb 1, 2016

@wietsefranssen - I reworked your COORD_DIMS_OUT changes in the last commit. Can you take a look and tell me what you think?

@@ -41,7 +41,6 @@ double calc_netshort(double, int, double, double *);
void check_files(filep_struct *, filenames_struct *);
FILE *check_state_file(char *, size_t, size_t, int *);
void close_files(filep_struct *, out_data_file_struct *, filenames_struct *);
size_t count_force_vars(FILE *gp);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this not needed for classic? Wasn't this just introduced? Does that mean that in vic_classic the user still needs to specify the number of forcing variables?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just moved to driver/shared

@bartnijssen
Copy link
Member

May be worth a second look or a bit of discussion about the comments above.

@jhamman
Copy link
Member Author

jhamman commented Feb 17, 2016

I've address all of @bartnijssen's original comments. As I mentioned before, changing the names of SHORTWAVE and LONGWAVE increased the scope of this PR but I think it was a nice set of improvements.

@wietsefranssen - I'd still appreciate you looking over this if you can get a chance.

This needs a rebase/squash then it should be ready to merge (pending no further comments).

@wietsefranssen
Copy link
Contributor

I've looked at all @bartnijssen's comments and I agree with all of them. I also agree in changing the radiations names (and on to choose from different options). This avoids confusion.

good work!

jhamman pushed a commit that referenced this pull request Feb 19, 2016
specify netcdf variable names in global parameter file
@jhamman jhamman merged commit 8340250 into UW-Hydro:develop Feb 19, 2016
@jhamman jhamman deleted the feature/force_ncvars branch February 19, 2016 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants