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

WMMA #872

Merged
merged 58 commits into from
Jan 30, 2024
Merged

WMMA #872

merged 58 commits into from
Jan 30, 2024

Conversation

adarmenov
Copy link
Contributor

Integrate WMMA changes into develop.

adarmenov and others added 30 commits October 5, 2020 12:54
The WGCM is a sibling of AGCM and OGCM. The WGCM component can
be run in either one-way coupled (passive) mode or two-way
coupled mode. The selection of a wave model is done through
the WGCM.rc file.
Extend DataSea GC to export ocean depth and currents. These
fields are just pass-through and are meant to be provided
by the ExtData GC.
Modify dry static energy and water vapor when the sea spray
parameterization is active.
Two way AGCM-WGCM coupling through air-sea momentum exchange based on
dynamical Charnock parameter and sea spray mediated heat fluxes.
When the active wave model is WW3, both the WW3 adapter/plug
component and the WGCM component need to be on the WW3 grid,
otherwise the regridded WW3 forcings and thus the modeled
waves will be incorrect.
…face and

resolve conflicts in:
   GEOS_GcmGridComp.F90
   GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90
   GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_OpenWaterGridComp.F90
   GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SaltWaterGridComp.F90
   GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90
   GEOSogcm_GridComp/GEOS_OgcmGridComp.F90
- Abandon the 2D decomposition approach in favour of the
1D decomposition in UMWM. This allows for easier use of
the standalone UMWM code in the GEOS implementation and
thus easier integration and maintenance.

- A notable limitation of the built in 1D decomposition is
the assumption that halo is constructed and updated with points
belonging/assigned to *only one* process. E.g. on MPI rank N,
all west boundary grid cells must have west neighbors that
belong on MPI rank N-1 and no other, and all east boundary
grid cells must have east neighbors that belong on MPI rank N+1
and no other. This assumption requires that the number of processes
cannot exceed a certain value that depends on the number of water
points.
Enable the calculation of the dynamical Charnock parameter. There
are no changes in the formulation.
@adarmenov adarmenov dismissed stale reviews from lcandre2, gmao-rreichle, and tclune via 03ab2d6 January 3, 2024 16:37
@adarmenov adarmenov requested a review from sanAkel January 3, 2024 17:16
@mathomp4
Copy link
Member

mathomp4 commented Jan 4, 2024

I'm taking a look at this now to fix the GNU build issue and I might have some CMake changes to suggest. I'll let you know.

@mathomp4
Copy link
Member

mathomp4 commented Jan 5, 2024

@adarmenov Oh. I might have made my PR to the wrong branch? This PR:

#876

Is going against feature/adarmenov/#347-wmma which is what I checked out from the fixture.

Would you like me to make a PR against this branch?

@adarmenov
Copy link
Contributor Author

@mathomp4 I keep the two branches synced with each other. You do not have to make a new PR.

GEOS_GcmGridComp.F90 Outdated Show resolved Hide resolved
GEOS_GcmGridComp.F90 Outdated Show resolved Hide resolved
@sdrabenh sdrabenh removed the Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) label Jan 30, 2024
@mathomp4 mathomp4 self-requested a review January 30, 2024 20:21
@mathomp4 mathomp4 merged commit e2b79bd into develop Jan 30, 2024
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch. enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants