Get Fit2Obs working with global-workflow again and add Jet support #11
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
- Change shebang to bash. - Remove jlogfile (no longer needed for ops). Refs #4
- Update bash shebang. - Remove other shebang. - Change "module purge" to "module reset" for WCOSS2. Refs #4
- Rename the RUN_ENVIR variable to OUTPUT_FILETYPE. - This change uses the correct variable that sets nemsio vs netcdf and avoids confusion with the RUN_ENVIR variable that is used in ops as nco or emc. Refs #4
…et_support * upstream/develop: add a comment for moving exec files reverting cmade exec names and locations to what they were before
- Remove ".x" from exec names in scripts. - Remove changes to include "/install" in exec and ush paths. Refs #4
- Remove "/install" from INSTALL_PREFIX default path. Users can still provide their own INSTALL_PREFIX path to install fit2obs elsewhere. - Remove lines added by Jack Woollen at bottom of build.sh to move execs back up to top level exec folder. Removing "/install" from INSTALL_PREFIX results in the same thing without adding the step to revert. Cleaning these lines also allows users to specific their own INSTALL_PREFIX while keeping the default install path in the top level as is desired by Fit2Obs CM. Refs #4
Add Jet support
|
Note: many of the script changes were tested in early tests when global-workflow still invoked the subfits scripts, before global-workflow work to run fit2obs as a dedicated job started (which invokes |
|
@jack-woollen I ingested the changes from the commit you did to I have rebuilt a fresh copy of my branch (with the above changes) and rerun a global-workflow gdasfit2obs job on Orion and it worked. My PR is ready for your review and merge (if you approve it). Let me know if you have any questions about my changes. Request for the future...please open PRs into the |
|
@KateFriedman-NOAA Actually I didn't forget to change the CMakeLists.txt files back, I just added the .x at the end of build.sh when copying them to the exec directory. Can you undo that in your PR? I'll update develop from a branch in the future. |
|
@jack-woollen My PR removes those lines you added at the bottom of Let me demonstrate...here I have already done a default build within my clone on Orion and the execs are under Now, if I create a test folder one level up (where I want to install instead) and pass I believe this satisfies both your needs and the ability for users to install anywhere. Let me know if you have questions, thanks! |
|
Great, thanks for approving and merging @jack-woollen ! :) |
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.
This PR brings in a series of small changes to get Fit2Obs working again with the updated global-workflow, which has undergone significant cleaning, standardization, and enhancement in recent months. The fact that Fit2Obs had different shell (not bash) caused failures when run from global-workflow. Support to build and run on Jet is also included.
Changes:
jlogfile(retired in operations, no longer needed/used).RUN_ENVIRtoOUTPUT_FILETYPE. TheRUN_ENVIRvariable is traditionally used asparaorprod, whereas it's used in Fit2Obs to mean the file format (nemsioornetcdf). Changed instances ofRUN_ENVIRto beOUTPUT_FILETYPE, which is the same variable used in global-workflow.I have tested my changes on Hera, Orion, and WCOSS2 for a number of cycles with success. These updates were also tested successfully on Jet by @DavidHuber-NOAA .
Resolves #4
Resolves #5
@jack-woollen There will be one, possibly two, more follow-up PRs (small ones) before we need a new tag cut. Thanks!