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

Bring WMMA (GEOSwgcm) into git #347

Open
adarmenov opened this issue Sep 17, 2020 · 0 comments
Open

Bring WMMA (GEOSwgcm) into git #347

adarmenov opened this issue Sep 17, 2020 · 0 comments
Assignees
Labels
communication/coordination Communication & coordination across repositories Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) enhancement New feature or request

Comments

@adarmenov
Copy link
Contributor

R&D was done in CVS:

  • tag: asd-Jason-3-WGCM-a04
  • module: GEOSwgcm
@adarmenov adarmenov added enhancement New feature or request Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) communication/coordination Communication & coordination across repositories labels Sep 17, 2020
@adarmenov adarmenov self-assigned this Sep 17, 2020
adarmenov added a commit that referenced this issue Mar 2, 2022
…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
adarmenov added a commit that referenced this issue Dec 15, 2023
Resolved conflicts:
	GEOS_GcmGridComp.F90
	GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90
	GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SaltWaterGridComp.F90
	GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90
	GEOSogcm_GridComp/GEOS_OceanGridComp/GEOS_OceanGridComp.F90
	GEOSogcm_GridComp/GEOS_OceanGridComp/GEOSdatasea_GridComp/GEOS_DataSeaGridComp.F90
	GEOSogcm_GridComp/GEOS_OgcmGridComp.F90
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
communication/coordination Communication & coordination across repositories Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

1 participant