Rename CIME Directories agsalin/mkdir_src #1186
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As discussed in issues #1178 and #1150, the four model source directories are moved to a CIME/src directory. This is intended to help people navigate cime more easily. The changes are mainly in xml config: $CIMEROOT/externals -> $CIMEROOT/src/externals repeated for driver_cpl, share, components. Also, many changes in python to add src to the relative directory path. scripts_regression_tests all pass
Move buildib.gptl, mct, etc. scripts from cime_config to src/build_scripts.
Per discussion on #1178 I used "git mv cime_config config" so history will be intact. I ran 2 tests to confirm. Need to really test in acme and cesm since many changes in allactive.
git mv driver_cpl drivers/mct and down one level, git mv driver main
Renamed directory per #1178
Per discussion in issue #1178
Moved all 4 subdirs from share/csm_share into share/ itself. Per discussion on issue #1178. Note: retained "csm_share" library name. At some point this should be renamed "cime_share," but this might be a requore changing component build systems.
Per discussion around #1178 and 2/22/17 meeting notes.
What was utils/python/tests, and previously moved to scripts/lib/tests recent commit, now moved to scripts/test. Also, move data_assililation from utils to scripts.
|
I think I did everything we discussed, as we decided. Only the data_assimilation move from utils to scripts was extra. I will start looking into how much work will be needed in ACME to match this change (and in CESM by analogy). |
jedwards4b
approved these changes
Feb 24, 2017
* master: Add some comments fix pylint problems Revert "Revert "add --mpilib option to create_test"" Not sure how the first revert got there This reverts commit 6bb7d0b. break up config_archive into component specific files Revert "add --mpilib option to create_test" Change driver and share code to use new shr_assert interface Allow passing file and line to shr_assert Update ChangeLog Add S-case test to cime_developers update to resolve problem with merge and PR #1159 add --mpilib option to create_test make sure pio1 finds netcdf4 Tweak ChangeLog text Update ChangeLog for cime5.2.0-alpha.25 Revert "update case_lt_archive python implimentation" update case_lt_archive python implimentation remove cime_config/cesm/allactive from CIME and replace it with an external changes to get pop namelists working with user_nl_pop changes
Merged in changes from 1188 into this mkdir_src branch. Updated all paths to renamed directory structure.
Several config_archive.xml files appeared after merge with master. Moving them to new location.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-organization of CIME directory structure based on Issue #1178 discussion.
Separate commits on this branch for each step -- tests pass at each stage:
Test suite: scripts/tests/scripts_regression_tests.py
Test baseline: N/A
Test namelist changes: N/A
Test status: bit for bit
Fixes #1178
Fixes #1150
User interface changes?: No
Code review: