NetCDF Output - Domain #365
Closed
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
Contributor
N1ckP3rsl3y
commented
Aug 4, 2023
N1ckP3rsl3y
commented
- Start the process of SOILWAT2 to output values to netCDFs
- Handle domain-related changes'
- See New "domain" that locates a run in a larger set of runs #360
added 21 commits
August 2, 2023 12:01
- Handle actions that deal with a domain entry into the program and constant information between simulation runs
- Move longitude, latitude, altitude, slope, and aspect from SW_SITE to SW_MODEL
- Created to hold information that may not change between simulation runs - Most start year, end year, start doy, and end doy from SW_SITE to new struct, SW_DOMAIN - SW_ALL gains an instance of this type
- After moving the values, longitude, latitude, elevation, slope, and aspect from SW_SITE to SW_MODEL, the same information has been moved from siteparam.in to years.in
domain.in - Moved time information (start year, end year, start doy, and end doy) from years.in - Contains information that is the same throughout simulation runs years.in - Rename to `modelrun.in` * Specifies the location and other aspects of a site that may change between simulation runs - Remove time information (start year, end year, start doy, and end doy)
- Because some content was moved from siteparam.in to modelrun.in, it makes sense to now read in the information through `SW_MDL_read()` - Deleted sections of the switch statement in `SW_SIT_read()` that reads site location - Commented old code within `SW_MDL_read()`
- List "Input/domain.in" in "files.in" before output files - New enumeration in SW_FileIndex - eDomain for domain.in - Increased the number of input files (SW_NFILES) to 24
- Update years.in --> modelrun.in - Location of the new domain file (`domain.in`) within `files.in` didn't necessarily cause problems, but was in the middle of the "Simulation outputs" in "SW_FileIndex" * So, rather than splitting up the output indices, the name was moved before the group
SW_MDL_read - Removed previously commented code that has been moved to SW_DOM_read - Now only warns the user when hemisphere is found SW_DOM_read - Reads in spatial and temporal information from `domain.in` - Fails/warns if something is incorrect/missing (start/end doy) - Removed superfluous code dealing with reading-in the end day of the year (enddayval array) - Still fails when start year is less than end year - Still warns the user when start year and/or end year is not input and is being set to a default key-to-id - Helper function to `SW_DOM_read` - Converts a possible key within `domain.in` (e.g., StartYear) and gives an id for the caller function to use SW_Domain.h - New defines * NUM_DOM_IN_KEYS - Maximum number of possible keys in `domain.in` * KEY_NOT_FOUND - Used if a user inputs a key that is not known to the program
- New reference to `domain.in` - Renamed years.in to modelrun.in
- Modified functions interfaces if needed to reach data from SW_Domain or to reach SW_Domain itself * The same goes for the other structs, SW_SITE and SW_MODEL - Qualifying files gain `SW_Domain.h` as an include Special mention: SW_VPD_init_run & estimateVegetationFromClimate - Removed unnecessary code setting of "veg_method" along with not explicitly sending it into estimateVegetationFromClimate
# Conflicts: # include/SW_Site.h # src/SW_Output.c # src/SW_Site.c
- To prepare for future parallelization, SW_DOMAIN is no longer within SW_ALL and is now a local variable within `main()`
- Because SW_DOMAIN is no longer in SW_ALL, and SW_DOMAIN, in the future, is expected to be outside simulations, SW_MODEL gains back start/end year and start/end day of year - When reading in SW_DOMAIN, SW_DOM_read() now copies that information to SW_MODEL - Program again uses SW_MODEL for start/end year and start/end day of year - SW_DOMAIN is now only used within SW_DOM_read - Updated interfaces if they SW_DOMAIN was no longer needed
dschlaep
reviewed
Aug 4, 2023
There was a problem hiding this comment.
Excellent work!
Almost there.
A couple comments including the need that SW_DOMAIN is the primary source of spatial and temporal information and cannot depend on SW_MODEL (SW_MODEL represents the space and time of one specific run out of the many that are described by SW_DOMAIN).
- Current code does not use these defines/variables, so they have been removed
- Removed hemisphere as an input in `modelrun.in` - Hemisphere is now calculated based on latitude
added 4 commits
August 5, 2023 13:41
- This is to represent that it is the "umbrella" input
- SW_DOM_read no longer accepts SW_MODEL as an argument and thus no longer uses it to update values * Start/end day of year are now only set through the input value or `Time_get_lastdoy_y()` - New function SW_DOM_setModelTime * Copies temporal domain information from SW_DOMAIN to SW_MODEL * Sets SW_MODEL's additional year * Called after SW_DOM_read in `SW_CTL_read_inputs_from_disk()`
dschlaep
previously approved these changes
Aug 11, 2023
dschlaep
reviewed
Aug 11, 2023
dschlaep
dismissed
their stale review
questions about the need to export domain_inkey_to_id() and inquiry about suids
added 3 commits
August 11, 2023 11:56
- The function `domain_inkey_to_id()` is not used outside of SW_Domain.c, so it has been changed to a static - Similarly, the defines found within SW_Domain.h have been moved locally to SW_Domain.c
- To make this define more accessible in the future, it has been moved from SW_Domain.c to SW_Defines.h
dschlaep
approved these changes
Aug 12, 2023
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.