Skip to content

Move MOM_generic_tracer.F90 to config_src/external/GFDL_ocean_BGC with no changes#790

Merged
Hallberg-NOAA merged 2 commits into
NOAA-GFDL:dev/gfdlfrom
NOAA-CEFI-Regional-Ocean-Modeling:dev/cefi_to_gfdl
Jan 1, 2025
Merged

Move MOM_generic_tracer.F90 to config_src/external/GFDL_ocean_BGC with no changes#790
Hallberg-NOAA merged 2 commits into
NOAA-GFDL:dev/gfdlfrom
NOAA-CEFI-Regional-Ocean-Modeling:dev/cefi_to_gfdl

Conversation

@yichengt900
Copy link
Copy Markdown

@yichengt900 yichengt900 commented Dec 31, 2024 •
edited
Loading

This PR relocates src/tracer/MOM_generic_tracer.F90 to config_src/external/GFDL_ocean_BGC/MOM_generic_tracer.F90 without introducing any code changes. This update should not affect baselines or the build process for the physics-only model.

To build the model with the generic tracer package, in addition to including the tracer folder, the following files from config_src/external/GFDL_ocean_BGC (or user custom versions) are required:

MOM_generic_tracer.F90
generic_tracer.F90
generic_tracer_utils.F90
FMS_coupler_util.F90

CC @theresa-morrison

@theresa-cordero
Move MOM_generic_tracer with no changes (#22)
9b2080b 
* Move MOM_generic_tracer with no changes

Renames src/tracer/MOM_generic_tracer.F90
to config_src/external/GFDL_ocean_BGC/MOM_generic_tracer.F90

* Remove MOM_generic_tracer

Git rm MOM_generic_tracer.F90

---------

Co-authored-by: Theresa Morrison <Theresa.Morrison@gaea68.ncrc.gov>
Hallberg-NOAA
Hallberg-NOAA approved these changes Jan 1, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@Hallberg-NOAA Hallberg-NOAA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with this PR to move the MOM_generic_tracer.F90 file. This move has been extensively discussed both within the GFDL MOM6 dev team and at MOM6 consortium-wide development calls, and there is a broad consensus that this is the right thing to do.

@Hallberg-NOAA
Copy link
Copy Markdown
Member

Hallberg-NOAA commented Jan 1, 2025

Although this has been approved, it can not be rebased on the latest version of dev/gfdl, and hence can not be merged. Ordinarily we would be able to rebase a PR, but this requires that the box "Allow edits and access to secrets by maintainers" be checked when you created the PR.

@yichengt900
Copy link
Copy Markdown
Author

yichengt900 commented Jan 1, 2025

Thanks. @Hallberg-NOAA. Marshall pointed it out the same issue before, and it appears that the option Allow edits and access to secrets by maintainers does not show up when merging an organization fork (weird). I have manually merged the recent updates into my feature branch.

@Hallberg-NOAA
Copy link
Copy Markdown
Member

Hallberg-NOAA commented Jan 1, 2025

This has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/mom6ci/MOM6/-/pipelines/25891.

@Hallberg-NOAA Hallberg-NOAA merged commit fcf5fff into NOAA-GFDL:dev/gfdl Jan 1, 2025
This was referenced Jan 2, 2025
Merged
Merged
Open
@theresa-cordero theresa-cordero mentioned this pull request Mar 18, 2025
Merged
@theresa-cordero theresa-cordero mentioned this pull request Apr 21, 2025
Merged
This was referenced Apr 23, 2025
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Hallberg-NOAA Hallberg-NOAA Hallberg-NOAA approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@yichengt900 @Hallberg-NOAA @theresa-cordero