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

Introduce cime_run(ntsteps), callable for TSMP-PDAF #36

Merged
merged 6 commits into from
Jun 26, 2024

Conversation

jjokella
Copy link
Contributor

  1. Re-introduce private statement, this was removed because variables from cime_comp_mod had to be used by TSMP-PDAF

  2. Add cime_run with number of time steps ntsteps as input. ntsteps is supplied by the TSMP-PDAF interface.

  3. Add stop_alarm for cime_run dependent on ntsteps.

jjokella added 2 commits June 19, 2024 08:56
- remove commented out debug output
- small style changes with the goal of being close to CIME tag
  `cime5.6.47`
1. re-introduce `private` statement, this was removed because
variables from `cime_comp_mod` had to be used by TSMP-PDAF

2. Add `cime_run` with number of time steps `ntsteps` as
input. `ntsteps` is supplied by the TSMP-PDAF interface.

3. Add `stop_alarm` for `cime_run` dependent on `ntsteps`.
@jjokella
Copy link
Contributor Author

Draft status: Waiting for testing of corresponding TSMP-PR: HPSCTerrSys/TSMP#229

@kvrigor
Copy link
Member

kvrigor commented Jun 19, 2024

@jjokella there are some changes here that overlap with #35; should that PR be already merged or do you prefer to have this PR merged instead?

@jjokella
Copy link
Contributor Author

jjokella commented Jun 19, 2024

I merged #35, which makes the commit history of this PR a bit ugly. After squashing this PR, everything should be in order again!

I am now waiting for HPSCTerrSys/TSMP#229. When this TSMP-PR is merged, I think this PR could follow for TSMP2.

jjokella added 3 commits June 25, 2024 17:53
before each forward simulation while-loop. Without this setting, the
`ntsteps`-induced `stop_alarm` for the while-loop was not called in a
CLM5-PDAF testcase.
@jjokella
Copy link
Contributor Author

HPSCTerrSys/TSMP#229 is tested and merged. All changes are under #ifdef USE_PDAF. So I propose merging this PR>

@jjokella jjokella marked this pull request as ready for review June 26, 2024 07:48
@jjokella jjokella merged commit 700e5c7 into master Jun 26, 2024
6 checks passed
@jjokella jjokella deleted the pdaf-simplify_enkf_clm_5 branch June 28, 2024 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants