search

FESOM / fesom2

Multi-resolution ocean general circulation model.
http://fesom.de/
GNU General Public License v3.0
45 stars 46 forks source link

Fesom2 4phy #605

Closed mueller79 closed 1 week ago

mueller79 commented 1 week ago

add Phaeocystis

JanStreffing commented 1 week ago

Hello @mueller79, this Merge Request contains a lot of old commits by @ogurses. I think these are not needed once https://github.com/FESOM/fesom2/pull/583 will be merged. Could you checkout refac_recom, cherrypick your commit and either add it to refac_recom, or create a new branch with a MR into refac_recom?

I believe this would be a cleaner way to merge your changes back, rather than to try and resolve the conflicts here.