-
Notifications
You must be signed in to change notification settings - Fork 100
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
Add multirun capability to blocking_neale POD #472
Conversation
Update with current development efforts
Revert "Update with current development efforts"
Github.com does not show hyperlinks with the ftp:// protocol, even if they're explicitly specified. Work around this by writing out the full URL in the document.
Fixes NOAA-GFDL#7 Github.com does not show hyperlinks with the ftp:// protocol, even if they're explicitly specified. Work around this by writing out the full URL in the document so users can find data.
Using temporary branch to resolve conflicts.
Merge required to pull in GFDL updates
Updated with latest from GFDL
I'm hoping that the failed tests are related to @wrongkindofdoctor's PRs this afternoon about fixing some failing tests. Also, I'm not sure how my fork ended up with these commits by Tom from 4 years ago? Let me know if you want me to clean it up and try again. |
@bitterbark Yes, the failures are from ci-related issues. I put in a couple of fixes, so you can verify that your code updates pass the ubuntu build tests once you pull them in. Your branch is derived from the old master branch, so that is probably why you have some lingering commits from Tom. Don't worry about cleaning up this PR, but checking out a new development branches from the main branch in your fork in the future should resolve this (i.e., every PR you submit should correspond to a unique branch). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bitterbark Overall, the modifications look good. I think that customizing the blocking_neale html template was a solid choice for the time being, and I appreciate the effort to delve into the code "guts". I will use the html file as a reference when I refactor the output manager. I just need you to sync your master branch with the main branch so that just the ubuntu tests run on your changes.
When I synced on the github web interface, it says I have merge conflicts that need to be resolved. However, on this PR I see it says "This branch has no conflicts with the base branch." And it looks like you just merged it. So is there something else I need to do? |
@bitterbark Your main branch should be alright if you haven't modified it. The master branch probably has conflicts because git can't resolve the updates with your commit history. If you don't have the option to resolve the conflicts with the web interface, you can update your remote and local main branches, then merge the main branch into your local master branch (assuming that's the branch you're trying to update). Resolve the merge conflicts in the problem files, commit the changes, and push them to your remote master branch. |
Thanks. I switched my main branch to be the default and renamed master to
master-don't-use (for myself to remember). Can I just leave it alone and
carryon with my main branch from now on?
…On Thu, Aug 17, 2023 at 9:30 AM Jess ***@***.***> wrote:
Your main branch should be alright if you haven't modified it. The master
branch probably has conflicts because git can'r resolve the updates with
your commit history (I don't know why this is). If you don't have the
option to resolve the conflicts with the web interface, you can update your
remote and local main branches, then merge the main branch into your local
master branch (assuming that's the branch you're trying to update). Resolve
the merge conflicts in the problem files, commit the changes, and push them
to your remote master branch.
—
Reply to this email directly, view it on GitHub
<#472 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AHLJVQCUCW4DBPM63YR7WVDXVY2JRANCNFSM6AAAAAA3LV6IIY>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
--
My working day may not be the same as your working day. Please do not feel
obliged to reply to this email outside of your normal hours.
|
@bitterbark Yes. Keep your copy of the main branch clean, and check out development branches from main moving forward. |
Description
blocking_neale POD can now run with multiple input model cases
Html page is written dynamically for however many cases are present
Modifications made to make date selection for each case and each observation more flexible (see diagnostics/blocking_neale/settings.jsonc)
Notes:
since we don't know how many cases will be present. However, at this stage it
is written into the POD_DIR instead of the
WK_DIR. This is not a good long-term solution because users won't always
have write access to their code base.
(This is necessary because the framework complains if there isn't a $POD_NAME.html file in the $POD_DIR.
If I leave a stub file instead, it overwrites the dynamic file. So I've reverted to writing the dynamic webpage into the POD_DIR but we should work on this in the future
model case)
dir. I haven't run multiple PODS in the multicase run to see how this works
(are all links in all pods)? but if this hasn't been done we should try it!
made of the top level dir, multi are the individual pod dirs. Again, I'm
not sure if this has been tested on multiple pods in a multi case scenerio.
How Has This Been Tested?
Ran in both multi-run and single-run mode using my own input files. Framework reports success and examination of website agrees.
Multi:
https://www2.cgd.ucar.edu/cms/bundy/Projects/diagnostics/mdtf/mdtf_figures/blocking_2023/20230810/multi/blocking_neale.html
Generated with
Single:
https://www2.cgd.ucar.edu/cms/bundy/Projects/diagnostics/mdtf/mdtf_figures/blocking_2023/20230810/single/blocking_neale/blocking_neale.html
Checklist:
will do immediately following, but I don't want to lose all of this PR doc by trying to commit that!
conda_env_setup.sh
Data is available on globus
Single run
Multi run