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

Allow user_mods directory in compset definition #1366

Merged
merged 38 commits into from
Apr 17, 2017

Commits on Apr 12, 2017

  1. 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 committed Apr 12, 2017
    Configuration menu
    Copy the full SHA
    09ed442 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2017

  1. Make sure ESP runs on pause for PRE test. Add missing units to driver…

    … buildnml
    Steve Goldhaber committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    b5dc7b7 View commit details
    Browse the repository at this point in the history
  2. Fixed pylint issue with unused output from cprnc

    Steve Goldhaber committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    40a4333 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2017

  1. 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 committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    1a1b475 View commit details
    Browse the repository at this point in the history
  2. Fixed pylint issue

    Steve Goldhaber committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    1d39746 View commit details
    Browse the repository at this point in the history
  3. Remove conditional pio1 code

    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.
    jayeshkrishna committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    8b2a76d View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2017

  1. Configuration menu
    Copy the full SHA
    314a93c View commit details
    Browse the repository at this point in the history
  2. Inform user of machine

    Promote to warning if machine doesn't match probed machine
    jgfouca committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    cb1ffe8 View commit details
    Browse the repository at this point in the history
  3. Big cs.status upgrade

    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
    jgfouca committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    ad0a5c1 View commit details
    Browse the repository at this point in the history
  4. add support for user_mods in compset definition

    jedwards4b authored and Mariana Vertenstein committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    562cf4b View commit details
    Browse the repository at this point in the history
  5. fix pylint issue

    jedwards4b authored and Mariana Vertenstein committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    efb7125 View commit details
    Browse the repository at this point in the history
  6. fix no-match args

    jedwards4b authored and Mariana Vertenstein committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    ea4a759 View commit details
    Browse the repository at this point in the history
  7. first changes needed for aquaplanet som

    Mariana Vertenstein committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    685c3fe View commit details
    Browse the repository at this point in the history
  8. 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.
    billsacks authored and Mariana Vertenstein committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    9cc7740 View commit details
    Browse the repository at this point in the history
  9. fixed issue with using new user_mods element in compset definition

    Mariana Vertenstein committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    8664933 View commit details
    Browse the repository at this point in the history
  10. Add unit tests for user_mod_support

    billsacks authored and Mariana Vertenstein committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    01ad744 View commit details
    Browse the repository at this point in the history
  11. Force user to always go through case.submit

    This was already the policy, but was not being enforced correctly.
    jgfouca committed Apr 16, 2017
    Configuration menu
    Copy the full SHA
    0a38bb5 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2017

  1. fix typo

    billsacks committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    8e8fd62 View commit details
    Browse the repository at this point in the history
  2. 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.
    billsacks committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    ec95467 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1350 from gold2718/pausePOP

    Fixes for PRE test
    jedwards4b authored Apr 17, 2017
    Configuration menu
    Copy the full SHA
    9903472 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1357 from ESMCI/jayeshkrishna/rem_cond_pio1_code

    Remove conditional pio1 code
    jedwards4b authored Apr 17, 2017
    Configuration menu
    Copy the full SHA
    1335a62 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1360 from ESMCI/jgfouca/machine_get_value_type

    Make Machines.get_value more likely to return values of the correct type
    jedwards4b authored Apr 17, 2017
    Configuration menu
    Copy the full SHA
    2530c66 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1361 from ESMCI/jgfouca/inform_user_of_machine

    Inform user of machine
    jedwards4b authored Apr 17, 2017
    Configuration menu
    Copy the full SHA
    8282a8f View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1362 from ESMCI/jgfouca/force_resubmit_to_use_submit

    Force user to always go through case.submit
    jedwards4b authored Apr 17, 2017
    Configuration menu
    Copy the full SHA
    dd5a30b View commit details
    Browse the repository at this point in the history
  8. Merge pull request #1363 from ESMCI/jgfouca/big_cs_status_upgrade

    Big cs.status upgrade
    jedwards4b authored Apr 17, 2017
    Configuration menu
    Copy the full SHA
    d0e277d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    8075121 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    29e0159 View commit details
    Browse the repository at this point in the history
  11. fix pylint issue

    jedwards4b committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    8c2bd51 View commit details
    Browse the repository at this point in the history
  12. fix no-match args

    jedwards4b committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    a1656f4 View commit details
    Browse the repository at this point in the history
  13. first changes needed for aquaplanet som

    Mariana Vertenstein authored and jedwards4b committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    582e308 View commit details
    Browse the repository at this point in the history
  14. 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.
    billsacks authored and jedwards4b committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    28e84b7 View commit details
    Browse the repository at this point in the history
  15. fixed issue with using new user_mods element in compset definition

    Mariana Vertenstein authored and jedwards4b committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    4df9f7e View commit details
    Browse the repository at this point in the history
  16. Add unit tests for user_mod_support

    billsacks authored and jedwards4b committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    4f6bb99 View commit details
    Browse the repository at this point in the history
  17. fix typo

    billsacks authored and jedwards4b committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    fc4ac0b View commit details
    Browse the repository at this point in the history
  18. 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.
    billsacks authored and jedwards4b committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    50e5d7a View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    3075576 View commit details
    Browse the repository at this point in the history
  20. Print user_mods directory upfront

    Point is: I want to make it hard to miss
    billsacks committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    0266e9d View commit details
    Browse the repository at this point in the history
  21. Merge branch 'mvertens/usermods_in_compset' of github.com:ESMCI/cime …

    …into mvertens/usermods_in_compset
    jedwards4b committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    ddd2162 View commit details
    Browse the repository at this point in the history