-
Notifications
You must be signed in to change notification settings - Fork 209
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
Allow user_mods directory in compset definition #1366
Commits on Apr 12, 2017
-
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. 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.
Steve Goldhaber committedApr 12, 2017 Configuration menu - View commit details
-
Copy full SHA for 09ed442 - Browse repository at this point
Copy the full SHA 09ed442View commit details
Commits on Apr 13, 2017
-
Make sure ESP runs on pause for PRE test. Add missing units to driver…
… buildnml
Steve Goldhaber committedApr 13, 2017 Configuration menu - View commit details
-
Copy full SHA for b5dc7b7 - Browse repository at this point
Copy the full SHA b5dc7b7View commit details -
Fixed pylint issue with unused output from cprnc
Steve Goldhaber committedApr 13, 2017 Configuration menu - View commit details
-
Copy full SHA for 40a4333 - Browse repository at this point
Copy the full SHA 40a4333View commit details
Commits on Apr 14, 2017
-
Remove unused variable, modify initialization to clarify purpose.
Move utility to turn time interval into seconds from driver buildnml to utils. Change PRE test to coarse grid for speedup.
Steve Goldhaber committedApr 14, 2017 Configuration menu - View commit details
-
Copy full SHA for 1a1b475 - Browse repository at this point
Copy the full SHA 1a1b475View commit details -
Steve Goldhaber committed
Apr 14, 2017 Configuration menu - View commit details
-
Copy full SHA for 1d39746 - Browse repository at this point
Copy the full SHA 1d39746View commit details -
We no longer pass rearranger options via pio_init(). We have only implemented (for now) passing rearranger options via pio_init() for non-async cases, but since we no longer pass rearranger opts via pio_init (and pio_set_rearr_opts() works for both async and non-async cases) we can get rid of the conditional ("#ifdef PIO1") code.
Configuration menu - View commit details
-
Copy full SHA for 8b2a76d - Browse repository at this point
Copy the full SHA 8b2a76dView commit details
Commits on Apr 16, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 314a93c - Browse repository at this point
Copy the full SHA 314a93cView commit details -
Promote to warning if machine doesn't match probed machine
Configuration menu - View commit details
-
Copy full SHA for cb1ffe8 - Browse repository at this point
Copy the full SHA cb1ffe8View commit details -
1) Can run from any directory 2) Pass through arguments from test-specific cs.status to general cs.status 3) Support for multiple test-ids 4) Add --summary option
Configuration menu - View commit details
-
Copy full SHA for ad0a5c1 - Browse repository at this point
Copy the full SHA ad0a5c1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 562cf4b - Browse repository at this point
Copy the full SHA 562cf4bView commit details -
Configuration menu - View commit details
-
Copy full SHA for efb7125 - Browse repository at this point
Copy the full SHA efb7125View commit details -
Configuration menu - View commit details
-
Copy full SHA for ea4a759 - Browse repository at this point
Copy the full SHA ea4a759View commit details -
first changes needed for aquaplanet som
Mariana Vertenstein committedApr 16, 2017 Configuration menu - View commit details
-
Copy full SHA for 685c3fe - Browse repository at this point
Copy the full SHA 685c3feView commit details -
Fix precedence of user_mods application
Now --user-mods on the command line (including testmods) will take precedence over the user_mods set by the compset - for user_nl files, shell_commands and SourceMods. I have tested this with this diff to the A compset diff --git a/src/drivers/mct/cime_config/config_compsets.xml b/src/drivers/mct/cime_config/config_compsets.xml index c11354e..7e6c2c9 100644 --- a/src/drivers/mct/cime_config/config_compsets.xml +++ b/src/drivers/mct/cime_config/config_compsets.xml @@ -40,6 +40,7 @@ <compset> <alias>A</alias> <lname>2000_DATM%NYF_SLND_DICE%SSMI_DOCN%DOM_DROF%NYF_SGLC_SWAV</lname> + <user_mods>/Users/sacks/temporary/user_mods_compset</user_mods> </compset> <compset> Along with this create_newcase command: ./create_newcase -case test_0414m -compset A -res f45_g37 \ --run-unsupported \ --user-mods-dir /Users/sacks/temporary/user_mods_command_line where the contents of the two relevant user_mods directories are: --- user_mods_compset/shell_commands --- ./xmlchange STOP_N=101 --- user_mods_compset/SourceMods/src.drv/mysrc.F90 --- user_mods_compset --- user_mods_compset/user_nl_cpl --- user_mods_compset --- user_mods_command_line/shell_commands --- ./xmlchange STOP_N=102 --- user_mods_command_line/SourceMods/src.drv/mysrc.F90 --- user_mods_command_line --- user_mods_command_line/user_nl_cpl --- user_mods_command_line The final contents are: --- user_nl_cpl --- user_mods_compset user_mods_command_line --- shell_commands --- ./xmlchange --force STOP_N=102 --- SourceMods/src.drv/mysrc.F90 --- user_mods_command_line And $ ./xmlquery STOP_N STOP_N: 102 thus demonstrating that the user_mods on the command-line takes precedence over the compset's user_mods.
Configuration menu - View commit details
-
Copy full SHA for 9cc7740 - Browse repository at this point
Copy the full SHA 9cc7740View commit details -
fixed issue with using new user_mods element in compset definition
Mariana Vertenstein committedApr 16, 2017 Configuration menu - View commit details
-
Copy full SHA for 8664933 - Browse repository at this point
Copy the full SHA 8664933View commit details -
Configuration menu - View commit details
-
Copy full SHA for 01ad744 - Browse repository at this point
Copy the full SHA 01ad744View commit details -
Force user to always go through case.submit
This was already the policy, but was not being enforced correctly.
Configuration menu - View commit details
-
Copy full SHA for 0a38bb5 - Browse repository at this point
Copy the full SHA 0a38bb5View commit details
Commits on Apr 17, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 8e8fd62 - Browse repository at this point
Copy the full SHA 8e8fd62View commit details -
Fix timing of applying compset user_mods
The previous implementation had two problems: 1. If you specified a user_mods on the command-line along with a compset that has its own user_mods, then the compset's user_mods get applied twice. 2. The new place where there was a call to apply_user_mods happened too early: xmlchange commands can not be done at that point. This fixes these problems. I have tested this with the same changes described in 9cc7740. I tested create_newcase with no user_mods, user_mods just from the command line, user_mods just from the compset, and user_mods from the command line and the compset.
Configuration menu - View commit details
-
Copy full SHA for ec95467 - Browse repository at this point
Copy the full SHA ec95467View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9903472 - Browse repository at this point
Copy the full SHA 9903472View commit details -
Merge pull request #1357 from ESMCI/jayeshkrishna/rem_cond_pio1_code
Remove conditional pio1 code
Configuration menu - View commit details
-
Copy full SHA for 1335a62 - Browse repository at this point
Copy the full SHA 1335a62View commit details -
Merge pull request #1360 from ESMCI/jgfouca/machine_get_value_type
Make Machines.get_value more likely to return values of the correct type
Configuration menu - View commit details
-
Copy full SHA for 2530c66 - Browse repository at this point
Copy the full SHA 2530c66View commit details -
Merge pull request #1361 from ESMCI/jgfouca/inform_user_of_machine
Inform user of machine
Configuration menu - View commit details
-
Copy full SHA for 8282a8f - Browse repository at this point
Copy the full SHA 8282a8fView commit details -
Merge pull request #1362 from ESMCI/jgfouca/force_resubmit_to_use_submit
Force user to always go through case.submit
Configuration menu - View commit details
-
Copy full SHA for dd5a30b - Browse repository at this point
Copy the full SHA dd5a30bView commit details -
Merge pull request #1363 from ESMCI/jgfouca/big_cs_status_upgrade
Big cs.status upgrade
Configuration menu - View commit details
-
Copy full SHA for d0e277d - Browse repository at this point
Copy the full SHA d0e277dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8075121 - Browse repository at this point
Copy the full SHA 8075121View commit details -
Configuration menu - View commit details
-
Copy full SHA for 29e0159 - Browse repository at this point
Copy the full SHA 29e0159View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c2bd51 - Browse repository at this point
Copy the full SHA 8c2bd51View commit details -
Configuration menu - View commit details
-
Copy full SHA for a1656f4 - Browse repository at this point
Copy the full SHA a1656f4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 582e308 - Browse repository at this point
Copy the full SHA 582e308View commit details -
Fix precedence of user_mods application
Now --user-mods on the command line (including testmods) will take precedence over the user_mods set by the compset - for user_nl files, shell_commands and SourceMods. I have tested this with this diff to the A compset diff --git a/src/drivers/mct/cime_config/config_compsets.xml b/src/drivers/mct/cime_config/config_compsets.xml index c11354e..7e6c2c9 100644 --- a/src/drivers/mct/cime_config/config_compsets.xml +++ b/src/drivers/mct/cime_config/config_compsets.xml @@ -40,6 +40,7 @@ <compset> <alias>A</alias> <lname>2000_DATM%NYF_SLND_DICE%SSMI_DOCN%DOM_DROF%NYF_SGLC_SWAV</lname> + <user_mods>/Users/sacks/temporary/user_mods_compset</user_mods> </compset> <compset> Along with this create_newcase command: ./create_newcase -case test_0414m -compset A -res f45_g37 \ --run-unsupported \ --user-mods-dir /Users/sacks/temporary/user_mods_command_line where the contents of the two relevant user_mods directories are: --- user_mods_compset/shell_commands --- ./xmlchange STOP_N=101 --- user_mods_compset/SourceMods/src.drv/mysrc.F90 --- user_mods_compset --- user_mods_compset/user_nl_cpl --- user_mods_compset --- user_mods_command_line/shell_commands --- ./xmlchange STOP_N=102 --- user_mods_command_line/SourceMods/src.drv/mysrc.F90 --- user_mods_command_line --- user_mods_command_line/user_nl_cpl --- user_mods_command_line The final contents are: --- user_nl_cpl --- user_mods_compset user_mods_command_line --- shell_commands --- ./xmlchange --force STOP_N=102 --- SourceMods/src.drv/mysrc.F90 --- user_mods_command_line And $ ./xmlquery STOP_N STOP_N: 102 thus demonstrating that the user_mods on the command-line takes precedence over the compset's user_mods.
Configuration menu - View commit details
-
Copy full SHA for 28e84b7 - Browse repository at this point
Copy the full SHA 28e84b7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4df9f7e - Browse repository at this point
Copy the full SHA 4df9f7eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4f6bb99 - Browse repository at this point
Copy the full SHA 4f6bb99View commit details -
Configuration menu - View commit details
-
Copy full SHA for fc4ac0b - Browse repository at this point
Copy the full SHA fc4ac0bView commit details -
Fix timing of applying compset user_mods
The previous implementation had two problems: 1. If you specified a user_mods on the command-line along with a compset that has its own user_mods, then the compset's user_mods get applied twice. 2. The new place where there was a call to apply_user_mods happened too early: xmlchange commands can not be done at that point. This fixes these problems. I have tested this with the same changes described in 9cc7740. I tested create_newcase with no user_mods, user_mods just from the command line, user_mods just from the compset, and user_mods from the command line and the compset.
Configuration menu - View commit details
-
Copy full SHA for 50e5d7a - Browse repository at this point
Copy the full SHA 50e5d7aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3075576 - Browse repository at this point
Copy the full SHA 3075576View commit details -
Print user_mods directory upfront
Point is: I want to make it hard to miss
Configuration menu - View commit details
-
Copy full SHA for 0266e9d - Browse repository at this point
Copy the full SHA 0266e9dView commit details -
Merge branch 'mvertens/usermods_in_compset' of github.com:ESMCI/cime …
…into mvertens/usermods_in_compset
Configuration menu - View commit details
-
Copy full SHA for ddd2162 - Browse repository at this point
Copy the full SHA ddd2162View commit details