Introduce static TimePartition struct for Iterator
#932
Conversation
jwallwork23
added
enhancement
| testXiosCalendar_MPI1 | ||
| PRIVATE "${MODEL_INCLUDE_DIR}" "${XIOS_INCLUDE_LIST}" "${ModulesRoot}/StructureModule" | ||
| PRIVATE | ||
| ${PHYSICS_INCLUDE_DIRS} |
There was a problem hiding this comment.
I had to add these includes to each of the XIOS tests to avoid linking errors when including Model.hpp.
|
|
||
| // Create a Model and configure it so that options are parsed | ||
| Model model(MPI_COMM_WORLD); | ||
| model.configureTime(); // TODO: Use Model.configure to parse restart files this way, too? |
There was a problem hiding this comment.
To address this TODO (and the similar ones in the other tests), we'll need to align the config option used for restart files with and without XIOS. It would make sense to me to do so, rather than having separate XIOS-specific options. We want to make the user experience as similar to the non-XIOS case as possible.
|
I need the model start and stop times for issue #926. I wrote some code yesterday to move the time logic to |
Okay great, thanks @timspainNERSC. |
|
See #936 |
|
Closing in favour of #936. |
# Add time limits to `ModelMetadata` Fixes #932 (partially) --- # Change Description Remove the time limit calculations (such as they are) from `Iterator` to `ModelMetadata`. Also, store the time limits in `ModelMetadata` and output them to the restart file through `CommonRestartMetadata`. As an added advantage, these values are now actually written to the restart file. --- # Test Description Ran the standard model configuration by hand to make sure the run length was still correct. The integration tests in the CI suite will provide automated testing. --- # Documentation Impact None: purely an internal change. --- # Other Details As it stands, this may currently break XIOS, as no configuration related to start time, stop time or time stepping is now passed to XIOS.
# Use model config in XIOS Fixes #925 Follows #936 Second attempt following #932 ~~Merges into #913~~ ### Task List - [x] Defined the tests that specify a complete and functioning change (*It may help to create a [design specification & test specification](../../../wiki/Specification-Template)*) - [x] Implemented the source code change that satisfies the tests - [x] Documented the feature by providing worked example - [x] Updated the README or other documentation - [x] Completed the pre-Request checklist below --- # Change Description This PR reuses the time metadata set as part of the config set in the XIOS handler. --- # Test Description For the purposes of testing, a separate `Model.configureTime` member function is created to avoid having to configure *everything*. I also needed to get the build system to create partition metadata files for 1 and 3 MPI ranks for the XIOS tests and to extend the configuration for all of them. --- # Documentation Impact The XIOS doc pages are updated to reflect these changes. --- ### Pre-Request Checklist - [x] The requirements of this pull request are fully captured in an issue or design specification and are linked and summarised in the description of this PR - [x] No new warnings are generated - [x] The documentation has been updated (or an issue has been created to track the corresponding change) - [x] Methods and Tests are commented such that they can be understood without having to obtain additional context - [x] This PR/Issue is labelled as a bug/feature/enhancement/breaking change - [x] This change conforms to the conventions described in the README
Introduce static
TimePartitionstruct forIteratorFixes #925
Task List
Change Description
This PR follows the recommendation in #925 to reduce duplication of configuration code by introducing a
TimePartitionstruct and a static instance of it associated with theIteratorclass. This gets set up duringModel.configureand may be accessed from other classes via theIterator::getTimePartitioninterface.Test Description
The XIOS tests are updated to be configured by
Model, so all of them now create an instance of this at the start. However, they currently use a reducedconfigureTimebecause setting up restart and partition files seems unnecessary for most of them.Documentation Impact
The XIOS doc pages are updated to reflect these changes.
Pre-Request Checklist