Skip to content

User/z1l/openmp#32

Merged
adcroft merged 4 commits into
dev/masterfrom
user/z1l/openmp
Jul 23, 2014
Merged

User/z1l/openmp#32
adcroft merged 4 commits into
dev/masterfrom
user/z1l/openmp

Conversation

@Zhi-Liang
Copy link
Copy Markdown
Contributor

@Zhi-Liang Zhi-Liang commented Jul 2, 2014

Rearrange order of code and simplify some code.

@adcroft adcroft mentioned this pull request Jul 14, 2014
Merged
@adcroft
Copy link
Copy Markdown
Collaborator

adcroft commented Jul 22, 2014

Zhi, solo_ocean/single_column_z, ocean_SIS/MOM6z_SIS_025 and ocean_SIS/OM4_025 have changed answers on this PR. The common thing between these examples is KPP. Can you merge in dev/master (includes updating CVmix submodule) and see what's happened? Thx

@Zhi-Liang
Copy link
Copy Markdown
Contributor Author

Zhi-Liang commented Jul 23, 2014

Hi Alistair,

This code will change answer due to order of operation if you adopt the
MOM_KPP.F90 and do not
use the latest cvmix_kpp.F90 from https://github.com/CVMix/CVMix-src. We
may merge the change in MOM_Kpp.F90 after the next release of cvmix.

Zhi

On Tue, Jul 22, 2014 at 5:54 PM, Alistair Adcroft (GFDL) <
notifications@github.com> wrote:

Zhi, solo_ocean/single_column_z, ocean_SIS/MOM6z_SIS_025 and
ocean_SIS/OM4_025 have changed answers on this PR. The common thing between
these examples is KPP. Can you merge in dev/master (includes updating CVmix
submodule) and see what's happened? Thx

—
Reply to this email directly or view it on GitHub
#32 (comment)
.

@adcroft adcroft merged commit c20118f into dev/master Jul 23, 2014
adcroft pushed a commit that referenced this pull request Oct 23, 2017
@alperaltuntas
Merge pull request #32 from gustavo-marques/delete_unecessary_changes
398bf5c 
Delete unecessary changes
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
@underwoo
Add check to send_tile_averaged_data for id <=0
ce5c50e 
This update mirrors the same check in send_data.

Also added a FATAL error to average_tiles and average_tiles1d if id is <=0.

average_tiles is now a module private routine

Reference mom-ocean#32
claireyung pushed a commit to claireyung/MOM6 that referenced this pull request Jan 12, 2026
@CodeGat
build-ci v3: Update Infra For spack v1 (mom-ocean#32)
7af8b12
dougiesquire pushed a commit to claireyung/MOM6 that referenced this pull request Jan 13, 2026
@CodeGat @dougiesquire
build-ci v3: Update Infra For spack v1 (mom-ocean#32)
2a560b5
andrew-c-ross pushed a commit to andrew-c-ross/MOM6 that referenced this pull request Mar 5, 2026
@theresa-cordero
Merge pull request mom-ocean#32 from NOAA-GFDL/dev/gfdl
4f4ad4e 
Merge branch 'NOAA-GFDL:dev/gfdl' into dev/cefi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Hallberg-NOAA Hallberg-NOAA

Labels

enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Zhi-Liang @adcroft @Hallberg-NOAA