Skip to content
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

refactoring with icebergs #489

Merged
merged 52 commits into from
Mar 13, 2024

Conversation

ackerlar
Copy link
Collaborator

No description provided.

@JanStreffing
Copy link
Collaborator

Hello @ackerlar, thank you for putting this PR together. Quite a big one! I did a scan of the PR, and I would recommend a general cleanup of

  • unused subroutines
  • comments with data and author of single lines
  • disused debug output

I found one line where the oifs and ifs setups were inadvertently modified. Besides that the merge conflicts have to be resolved of course. Overall a great step forward. Let me know if you have some questions / would like some help. I'd happily sit together for an our or so, getting this one on track.

@JanStreffing
Copy link
Collaborator

I had a quick chat about this one with @patrickscholz. Most of the merge conflicts are trivial. Only the one in src/fesom_module.F90 looks to be a bit more complex. Maybe you can do the others ones yourself, and if you get stuck with src/fesom_module.F90, Patrick or me try to help out.

@ackerlar
Copy link
Collaborator Author

All checks seem to work with the latest commit. Is there anything I need to do now?

@JanStreffing
Copy link
Collaborator

All checks seem to work with the latest commit. Is there anything I need to do now?

You still need to request a review.

@patrickscholz
Copy link
Contributor

@trackow: Is there the possibility that you test this branch if it compiles with IFS, just to be sure we dont fuck anything up when we merge !

@JanStreffing JanStreffing added this to the FESOM 2.6 milestone Feb 28, 2024
src/MOD_DYN.F90 Show resolved Hide resolved
src/MOD_ICE.F90 Show resolved Hide resolved
src/MOD_ICE.F90 Show resolved Hide resolved
src/fesom_module.F90 Outdated Show resolved Hide resolved
src/gen_forcing_couple.F90 Outdated Show resolved Hide resolved
src/icb_dyn.F90 Outdated Show resolved Hide resolved
src/icb_dyn.F90 Outdated Show resolved Hide resolved
src/icb_elem.F90 Show resolved Hide resolved
src/icb_elem.F90 Show resolved Hide resolved
src/icb_step.F90 Outdated Show resolved Hide resolved
@JanStreffing JanStreffing merged commit 7214b57 into FESOM:refactoring Mar 13, 2024
2 checks passed
@JanStreffing JanStreffing mentioned this pull request Mar 13, 2024
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.

5 participants