Skip to content

Update submodule pointer for NCEPLIBS-pyprodutil#51

Merged
MinsukJi-NOAA merged 1 commit into
NOAA-EMC:developfrom
climbfuji:rahul_feature_s4_with_submodule_pointer_update_pyprodutil
Apr 17, 2020
Merged

Update submodule pointer for NCEPLIBS-pyprodutil#51
MinsukJi-NOAA merged 1 commit into
NOAA-EMC:developfrom
climbfuji:rahul_feature_s4_with_submodule_pointer_update_pyprodutil

Conversation

@climbfuji
Copy link
Copy Markdown
Contributor

@climbfuji climbfuji commented Apr 14, 2020

This PR only updates the submodule pointer for NCEPLIBS-pyprodutil to point to the current head of the develop branch:

commit ca171b95095db4fcd0fc7b01c23d073d90becd99 (HEAD, origin/develop, origin/HEAD, develop)
Merge: 62561d2 1fc711d
Author: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date:   Mon Mar 30 10:10:15 2020 -0400

    Merge pull request #5 from SamuelTrahanNOAA/slurm-label

    srun --label support: pass --label when label_io=True

Associated PRs:

NOAA-EMC/GFDL_atmos_cubed_sphere#17
NCAR/ccpp-framework#283
NCAR/ccpp-physics#436
NOAA-EMC/ufsatm#98
ufs-community/ufs-weather-model#102

For regression testing information, see ufs-community/ufs-weather-model#102.

@MinsukJi-NOAA
Copy link
Copy Markdown
Collaborator

@climbfuji, these changes were committed to NEMS already: 16e1b94. Please let me know otherwise.

@climbfuji
Copy link
Copy Markdown
Contributor Author

Sorry, this is so confusing. I checked out develop from NEMS, and I see that these changes are in. But what about the submodule pointer for pyprodutil? Which hash do you want me to use there? If I check out develop in NCEPLIBS-pyprodutil, I have

commit ca171b95095db4fcd0fc7b01c23d073d90becd99 (HEAD, origin/develop, origin/HEAD, develop)
Merge: 62561d2 1fc711d
Author: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date:   Mon Mar 30 10:10:15 2020 -0400

    Merge pull request #5 from SamuelTrahanNOAA/slurm-label

    srun --label support: pass --label when label_io=True

but this hash is not the one that NEMS has at the moment. So at least I need to update that one (making this PR much more trivial, of course). @junwang-noaa

@climbfuji climbfuji force-pushed the rahul_feature_s4_with_submodule_pointer_update_pyprodutil branch from d3ae3e1 to 4a59826 Compare April 14, 2020 17:22
@climbfuji climbfuji changed the title Merge aerorahul:feature/s4 into develop 2020/04/14 Update submodule pointer for NCEPLIBS-pyprodutil Apr 14, 2020
@climbfuji
Copy link
Copy Markdown
Contributor Author

Sorry, this is so confusing. I checked out develop from NEMS, and I see that these changes are in. But what about the submodule pointer for pyprodutil? Which hash do you want me to use there? If I check out develop in NCEPLIBS-pyprodutil, I have

commit ca171b95095db4fcd0fc7b01c23d073d90becd99 (HEAD, origin/develop, origin/HEAD, develop)
Merge: 62561d2 1fc711d
Author: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date:   Mon Mar 30 10:10:15 2020 -0400

    Merge pull request #5 from SamuelTrahanNOAA/slurm-label

    srun --label support: pass --label when label_io=True

but this hash is not the one that NEMS has at the moment. So at least I need to update that one (making this PR much more trivial, of course). @junwang-noaa

Ok, I think this is correct now.

@MinsukJi-NOAA
Copy link
Copy Markdown
Collaborator

You are right... Somehow pyprodutil has two identical commits: 1fc711dc021f08f5d1eda2f4b5108af43ae33ef7 & ca171b95095db4fcd0fc7b01c23d073d90becd99

@climbfuji
Copy link
Copy Markdown
Contributor Author

Ok - the one I have now (ca171b9) is the head of develop.

@junwang-noaa
Copy link
Copy Markdown
Collaborator

Sorry, this is so confusing. I checked out develop from NEMS, and I see that these changes are in. But what about the submodule pointer for pyprodutil? Which hash do you want me to use there? If I check out develop in NCEPLIBS-pyprodutil, I have

commit ca171b95095db4fcd0fc7b01c23d073d90becd99 (HEAD, origin/develop, origin/HEAD, develop)
Merge: 62561d2 1fc711d
Author: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date:   Mon Mar 30 10:10:15 2020 -0400

    Merge pull request #5 from SamuelTrahanNOAA/slurm-label

    srun --label support: pass --label when label_io=True

but this hash is not the one that NEMS has at the moment. So at least I need to update that one (making this PR much more trivial, of course). @junwang-noaa

Ok, I think this is correct now.

Actually I thought we only make s2 related code changes in ufs-weather-model side. Anyway it's good if we update ufs-weather-model to the latest develop of prod-util. So now after we finish all the RT, we can ask Minsuk to commit.

@MinsukJi-NOAA
Copy link
Copy Markdown
Collaborator

I think we can merge this one because this was tested previously: #47. As mentioned above, pyprodutil 1fc711d (one that NEMS is currently pointing to) & ca171b9 (head of develop) are identical. @junwang-noaa @climbfuji please let me know.

@MinsukJi-NOAA MinsukJi-NOAA merged commit 8e1f15c into NOAA-EMC:develop Apr 17, 2020
DeniseWorthen added a commit to DeniseWorthen/NEMS that referenced this pull request Apr 17, 2020
Update submodule pointer for NCEPLIBS-pyprodutil (NOAA-EMC#51)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants