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

Fixes for PRE test #1350

Merged
merged 5 commits into from
Apr 17, 2017
Merged

Fixes for PRE test #1350

merged 5 commits into from
Apr 17, 2017

Conversation

gold2718
Copy link

New method for setting and detecting pause alarms in component models
Refactor access to components which are paused
Pause works with the driver and at least one active component (POP).
Active component (POP) able to correctly process resume signal.
PRE test refactored to be more flexible.
Modify code and scripts to error if NINST_ESP > 1.
Fixed NCK test to not set NINST_ESP > 1
Added PRE test back to cime_developer.

Test suite: scripts_regression_tests.py on Yellowstone (CESM) and compute001 (ACME)
CESM prealpha on hobart_nag
Test baseline: NA
Test namelist changes: NA
Test status: bit for bit

Fixes #1112

User interface changes?: NA

Code review:

Steve Goldhaber added 3 commits April 12, 2017 11:48
Refactor access to components which are paused
Pause works with the driver and at least one active component (POP).
Active component (POP) able to correctly process resume signal.
PRE test refactored to be more flexible.
Find good restart variable to change for POP PRE test (PSURF_CUR).
Modify code and scripts to error if NINST_ESP > 1.
Fixed NCK test to not set NINST_ESP > 1
Added PRE test back to cime_developer. Fails with CIME_MODEL=acme.
@gold2718 gold2718 self-assigned this Apr 13, 2017
@@ -31,26 +33,36 @@ def __init__(self, case):
run_two_suffix='pr',
run_one_description='no pause/resume',
run_two_description='pause/resume')
self._stopopt = 'ndays'
Copy link
Contributor

Choose a reason for hiding this comment

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

Should these be in config_tests.xml and not here?

Copy link
Author

Choose a reason for hiding this comment

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

They were really placeholders. I modified the values to just initialize the variables in __init__, the working values do come from config_tests.xml.

@@ -23,6 +23,24 @@ from CIME.XML.files import Files
logger = logging.getLogger(__name__)

###############################################################################
def _get_time_in_seconds(time, unit):
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't there already a function in CIME.utils for this? If not wouldn't that be a better place for it? Perhaps all of the time utilities should be moved to a new time_utils.py file.

Copy link
Author

@gold2718 gold2718 Apr 14, 2017

Choose a reason for hiding this comment

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

I could not find such a function so I moved this function from buildnml to CIME.utils.
I'm guessing you were thinking of convert_to_seconds which takes a different type of input.

Steve Goldhaber added 2 commits April 14, 2017 12:33
Move utility to turn time interval into seconds from driver buildnml to utils.
Change PRE test to coarse grid for speedup.
@gold2718
Copy link
Author

I believe I have addressed @jedwards4b useful comments (and rerun scripts_regression_tests).

@jedwards4b jedwards4b merged commit 9903472 into ESMCI:master Apr 17, 2017
jgfouca pushed a commit that referenced this pull request Jun 2, 2017
Provide aerosol initialization support for SCM runs

Code employs the aerosol specification methods of Lebassi-Habtezion and
Caldwell (2015) to allow for scientifically credible SCM simulations.
Specifically, the user can specify the liquid/ice concentration via the
namelist or specify observed aerosols provided they are included in the
IOP file. Also included in this PR are optional switches to turn off
longwave and shortwave radiation calculations to enable a match of
GCSS idealizations for certain cases. acme_developer tests have been
peformed and this tag is bit-4-bit, as expected.

[BFB]

* bogensch/atm/SCM_dev_BLH_v3:
  bug fix
  compset updates
  fix to generic SCM use case
  first step of PR review modifications
  change comments in file
  bug fix for compilation in full model
  SCM modifications
jgfouca pushed a commit that referenced this pull request Feb 23, 2018
Provide aerosol initialization support for SCM runs

Code employs the aerosol specification methods of Lebassi-Habtezion and
Caldwell (2015) to allow for scientifically credible SCM simulations.
Specifically, the user can specify the liquid/ice concentration via the
namelist or specify observed aerosols provided they are included in the
IOP file. Also included in this PR are optional switches to turn off
longwave and shortwave radiation calculations to enable a match of
GCSS idealizations for certain cases. acme_developer tests have been
peformed and this tag is bit-4-bit, as expected.

[BFB]

* bogensch/atm/SCM_dev_BLH_v3:
  bug fix
  compset updates
  fix to generic SCM use case
  first step of PR review modifications
  change comments in file
  bug fix for compilation in full model
  SCM modifications
jgfouca pushed a commit that referenced this pull request Mar 13, 2018
Provide aerosol initialization support for SCM runs

Code employs the aerosol specification methods of Lebassi-Habtezion and
Caldwell (2015) to allow for scientifically credible SCM simulations.
Specifically, the user can specify the liquid/ice concentration via the
namelist or specify observed aerosols provided they are included in the
IOP file. Also included in this PR are optional switches to turn off
longwave and shortwave radiation calculations to enable a match of
GCSS idealizations for certain cases. acme_developer tests have been
peformed and this tag is bit-4-bit, as expected.

[BFB]

* bogensch/atm/SCM_dev_BLH_v3:
  bug fix
  compset updates
  fix to generic SCM use case
  first step of PR review modifications
  change comments in file
  bug fix for compilation in full model
  SCM modifications
@gold2718 gold2718 deleted the pausePOP branch December 5, 2023 17:15
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.

3 participants