search

m2lines / CAM-ML

Community Atmosphere Model
0 stars 0 forks source link

Implement YOG scheme in code #14

Closed jatkinson1000 closed 1 week ago

jatkinson1000 commented 2 weeks ago

This supercedes #9 following changes to the way the YOG scheme is triggered (no longer as a deep_scheme option but now as its own yog_scheme switch) as suggested by @paogorman.

Closes #4 by bringing the source code extracted from SAM and the interface written for CAM over into this repository.

Closes #10 by moving YOG implementation to a separate interface keeping physpkg.F90 clean.

Closes #13 by rebasing on #2 to implement YOG as a scheme independent from deep_scheme with its own switch, allowing the code to be run with deep_scheme='off' to ensure there is no double counting.

This code is similar to that presented at the M2LInES annual meeting (see tag https://github.com/m2lines/CAM-ML/commit/17aaa794f187200d1dfc8c4a9d211a7d619b2cc6), but with the improvement that YOG is now an independent scheme and we can run with deep_scheme='off'.

I propose merging this as a significant waypoint so that further developments that have been proposed can be worked on as separate issues and branches. This will help with project management and workflow

jatkinson1000 commented 1 week ago

@MarionBWeinzierl This is now ready for re-review. Once you are happy with the changes I will rebase on top of main (which should resolve the conflicts) and then merge.

I'm inclined to squash and merge, though could see arguments for a merge commit if you have any thoughts there?

MarionBWeinzierl commented 1 week ago

@MarionBWeinzierl This is now ready for re-review. Once you are happy with the changes I will rebase on top of main (which should resolve the conflicts) and then merge.

I'm inclined to squash and merge, though could see arguments for a merge commit if you have any thoughts there?

My preference is usually a merge without squash, to keep the commit history -- unless keeping the commit history is what you want to avoid. ;)

MarionBWeinzierl commented 1 week ago

[celebrate] Marion Weinzierl reacted to your message:

From: jatkinson1000 @.> Sent: Wednesday, June 26, 2024 6:33:50 AM To: m2lines/CAM-ML @.> Cc: Marion Weinzierl @.>; Mention @.> Subject: Re: [m2lines/CAM-ML] Implement YOG scheme in code (PR #14)

Merged #14https://github.com/m2lines/CAM-ML/pull/14 into CAM-ML.

— Reply to this email directly, view it on GitHubhttps://github.com/m2lines/CAM-ML/pull/14#event-13293033469, or unsubscribehttps://github.com/notifications/unsubscribe-auth/ANOKODFVCK5BVKSRSQFTLE3ZJJOE5AVCNFSM6AAAAABJR3R27KVHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJTGI4TGMBTGM2DMOI. You are receiving this because you were mentioned.Message ID: @.***>