update MOM6

[jiandewang]

need to update MOM6 to GFDL dev/master (May 29th commit hash # 48d208d), which refers to dev-master-candidate-2020-05-15

[jiandewang]

add detail discussion information here
MOM6 update RP.pdf

Denise and Jessica: can you do PR review ?

[JessicaMeixner-NOAA]

You mention a bug fix in the write up, but I don't see a commit past the original merge commit, committing this bug fix?

[jiandewang]

yes, see line 411 at https://github.com/jiandewang/MOM6/blob/feature/update-to-GFDL-20200515/src/parameterizations/vertical/MOM_full_convection.F90

…

On Tue, Jul 7, 2020 at 2:16 PM Jessica Meixner ***@***.***> wrote: You mention a bug fix in the write up, but I don't see a commit past the original merge commit, committing this bug fix? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#27 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADMGAS4QB6SWDNPAOWOB5CDR2NRADANCNFSM4OF5GX2Q> .

-- Jiande Wang IMSG at NOAA/NWS/NCEP/EMC cubic 2088 jiande.wang@noaa.gov phone:3016833725

[JessicaMeixner-NOAA]

Was this bug fix a merging issue that needed to be resolved? Or something else? If it is not related to the merge itself, shouldn't this be added in a subsequent commit instead of as I see now an addition to the merge commit? It's confusing to me now what is from the merge, what's a bug fix, etc.

[jiandewang]

this is my current git log: commit 3850530 Merge: bbdef39 48d208d Author: jiandewang <jiande.wang@noaa.gov> Date: Thu Jun 4 23:42:02 2020 -0400 merge GFDL dev/master May 29, 2020 commit (hash # 48d208d), which refer to dev-master-candidate-2020-05-15 solve conflict in: (1) config_src/coupled_driver/MOM_surface_forcing_gfdl.F90 (2) src/core/MOM_forcing_type.F90 BUG FIXING: add missing halo in MOM_full_convection.F90 as we discussed early, we prefer to have "merge GFDL ......" information in the head of the git log, this is why I add BUG FIXING here. I can start from scratch again to have two commits: commit (1) merge GFDL ......, the commit log will be: merge GFDL ..... solve conflict .... commit (2) bug fixing .... in this way, in the PR request the git log information you will see will be "bug fixing ......", you won't see "merge GFDL ...." information here. All I need to know is which way you prefer.

…

On Tue, Jul 7, 2020 at 2:33 PM Jessica Meixner ***@***.***> wrote: Was this bug fix a merging issue that needed to be resolved? Or something else? If it is not related to the merge itself, shouldn't this be added in a subsequent commit instead of as I see now an addition to the merge commit? It's confusing to me now what is from the merge, what's a bug fix, etc. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#27 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADMGAS2KS6HAC2TQFO3ALL3R2NTAHANCNFSM4OF5GX2Q> .

-- Jiande Wang IMSG at NOAA/NWS/NCEP/EMC cubic 2088 jiande.wang@noaa.gov phone:3016833725

[JessicaMeixner-NOAA]

@jiandewang if the bug fix is independent of the merge, it should be in it's own independent commit -- so to me the second is the more straightforward process so everyone knows what is going on.

[jiandewang]

OK I will re-create a new MOM6 branch based on our discussion. Actually this will be easier than what I did before. Previously I had to do "git commit --force" in order to keep "merge GFDL ..." information on top of commit log.

…

On Tue, Jul 7, 2020 at 3:18 PM Jessica Meixner ***@***.***> wrote: @jiandewang <https://github.com/jiandewang> if the bug fix is independent of the merge, it should be in it's own independent commit -- so to me the second is the more straightforward process so everyone knows what is going on. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#27 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADMGAS4QX6MLSC7VITRZ7ULR2NYGLANCNFSM4OF5GX2Q> .

-- Jiande Wang IMSG at NOAA/NWS/NCEP/EMC cubic 2088 jiande.wang@noaa.gov phone:3016833725

[jiandewang]

code merged, close this issue