Feature/fix initialization of coupler fields #716
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Note: we may want to combine |
…itialization_of_coupler_fields
jhamman
requested changes
Jun 7, 2017
| @@ -36,6 +36,7 @@ | |||
| #define GLOBALPARAM "vic.globalconfig.txt" | |||
| #define RPOINTER "rpointer.lnd" | |||
| #define SHR_CONST_SPVAL 1.0e30 /**< CESM missing value */ | |||
| #define SHR_CONST_STEBOL 5.67e-8 /**< Stefan-Boltzmann constant ~ W/m^2/K^4 */ | |||
There was a problem hiding this comment.
this line/variable should be removed and we should use the equivalent constant in vic_run.
| l2x_vic[i].l2x_Fall_flxdst4 = 0; | ||
| l2x_vic[i].l2x_Fall_flxvoc = 0; | ||
| l2x_vic[i].l2x_Flrl_rofliq = 0; | ||
| l2x_vic[i].l2x_Flrl_rofice = 0; |
There was a problem hiding this comment.
What's the logic you are using for setting some to SHR_CONST_SPVAL and some to zero? Add a comment above.
There was a problem hiding this comment.
I've gone back to setting all to SHR_CONST_SPVAL for now. But I think we should revisit this, as we set the coupler fields to 0 previously for VIC in RASM (I'll make an issue for it so we can figure out what we want to do).
This reverts commit d99a929.
jhamman
approved these changes
Jul 12, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #xxxnew tests addedscience test figuresThis PR does the following:
sets the temperature field in the
l2x_data_struct(l2x_Sl_t) during initialization usingavg_tempfrom thesoil_con_struct, which is equivalent to using the temperature of the top soil layer, since this is the value we use to initialize soil temperatures from a cold startsets the upwelling longwave field in the
l2x_data_struct(l2x_Fall_lwup) usingl2x_Sl_tand emissivity from theparamstruct