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

User/z1l/group pass #33

Merged
merged 13 commits into from
Jul 22, 2014
Merged

User/z1l/group pass #33

merged 13 commits into from
Jul 22, 2014

Conversation

Zhi-Liang
Copy link
Contributor

Use group halo pass interface: group_pass_type, create_group_pass, do_group_pass, start_group_pass, complete_group_pass.

@adcroft
Copy link
Collaborator

adcroft commented Jul 14, 2014

Bob, Note that this includes the commits in pull request #32 + one other commit efd6249. I'm not sure but I think that handling this pull request will automatically handle #32 because github pull requests are based on refs. To save time, try handling #33 first. Request #32 is based on the ref c152896 which is second to last in this request. If handling #33 doesn't close #32 then we'll just close the other by hand.

This will be an interesting experiment with github and we are watching your handling of the pull request with great interest - no pressure! :^)

@Hallberg-NOAA
Copy link
Collaborator

I tried doing the checkout and merge commands, but it appears that a new version of the shared code is required for these changes to compile. I am using the tikal_201403 shared code. What version of the shared code do these updates require?

@Hallberg-NOAA
Copy link
Collaborator

  This pull request appears to require
  an update of the mpp shared code beyond tikal_201403. It failed to
  compile when I ran the commands as written.
    - Bob Hallberg Dr. Robert Hallberg

Oceanographer and Ocean Group Head
NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508
Princeton University Forrestal Campus || Home: (732) 463-1274
201 Forrestal Road || Fax: (609) 987-5063
Princeton, New Jersey 08540-6649 || Email: [email protected]

  On 07/14/2014 05:17 PM, Alistair Adcroft (GFDL) wrote:

  Bob, Note that this includes the commits in pull request #32 + one other
    commit efd6249. I'm not sure but I think
    that handling this pull request will automatically handle #32 because
    github pull requests are based on refs. To save time, try
    handling #33 first.
    Request #32 is based on
    the ref c152896 which is second to l
    ast in this request. If handling #33 doesn't
    close #32 then we'll
    just close the other by hand.
  This will be an interesting experiment with github and we are
    watching your handling of the pull request with great interest -
    no pressure! :^)
  —
    Reply to this email directly or view
      it on GitHub.

@anderson-gfdl
Copy link

Popping popcorn.

Whit Anderson, Ph.D., Oceanographer
NOAA Geophysical Fluid Dynamics Laboratory
201 Forrestal Road
Princeton, New Jersey 08540
Phone: (609) 452-5308
http://www.gfdl.noaa.gov/whit-anderson-homepage

Carpe diem (cum consensus uxori).

On Jul 14, 2014, at 7:25 PM, Robert Hallberg wrote:

This pull request appears to require
an update of the mpp shared code beyond tikal_201403. It failed to
compile when I ran the commands as written.

  • Bob Hallberg Dr. Robert Hallberg
    Oceanographer and Ocean Group Head
    NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508
Princeton University Forrestal Campus || Home: (732) 463-1274
201 Forrestal Road || Fax: (609) 987-5063
Princeton, New Jersey 08540-6649 || Email: [email protected]

On 07/14/2014 05:17 PM, Alistair Adcroft (GFDL) wrote:

Bob, Note that this includes the commits in pull request #32 + one other
commit efd6249. I'm not sure but I think
that handling this pull request will automatically handle #32 because
github pull requests are based on refs. To save time, try
handling #33 first.
Request #32 is based on
the ref c152896 which is second to l
ast in this request. If handling #33 doesn't
close #32 then we'll
just close the other by hand.
This will be an interesting experiment with github and we are
watching your handling of the pull request with great interest -
no pressure! :^)

Reply to this email directly or view
it on GitHub.

Reply to this email directly or view it on GitHub.

@Zhi-Liang
Copy link
Contributor Author

Hi Bob,

Sorry I forgot to mention the shared codes update. The following shared
codes will work
cvs co -r tikal_201406 shared
cvs up -r tikal_group_update_fix_z1l
shared/mpp/include/mpp_domains_misc.inc
cvs up -r tikal_group_update_fix_z1l
shared/mpp/include/mpp_domains_util.inc
cvs up -r tikal_group_update_fix_z1l shared/mpp/include/mpp_group_update.h
cvs up -r tikal_group_update_fix_z1l shared/mpp/mpp_domains.F90
cvs up -r tikal_group_update_fix_z1l shared/mpp/test_mpp_domains.F90

These fixes is to make non-blocking halo pass to work. I only tested the
block version before tikal_201406.
If you do not want to update to tikal_group_update_fix_z1l, we may wait
until the next patch release ( At that time,
I will merge user/z1l/group_pass with dev/master).

Thanks.

Zhi

On Mon, Jul 14, 2014 at 7:25 PM, Robert Hallberg [email protected]
wrote:

This pull request appears to require
an update of the mpp shared code beyond tikal_201403. It failed to
compile when I ran the commands as written.

  • Bob Hallberg Dr. Robert Hallberg
    Oceanographer and Ocean Group Head
    NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508
Princeton University Forrestal Campus || Home: (732) 463-1274
201 Forrestal Road || Fax: (609) 987-5063
Princeton, New Jersey 08540-6649 || Email: [email protected]

On 07/14/2014 05:17 PM, Alistair Adcroft (GFDL) wrote:

Bob, Note that this includes the commits in pull request #32 + one other
commit efd6249. I'm not sure but I think
that handling this pull request will automatically handle #32 because
github pull requests are based on refs. To save time, try
handling #33 first.
Request #32 is based on
the ref c152896 which is second to l
ast in this request. If handling #33 doesn't
close #32 then we'll
just close the other by hand.
This will be an interesting experiment with github and we are
watching your handling of the pull request with great interest -
no pressure! :^)

Reply to this email directly or view
it on GitHub.


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

@Hallberg-NOAA
Copy link
Collaborator

Hi Zhi,
    We have several MOM6 readers outside of GFDL who only have
  access to the MOM6 and shared code via GitHub. I think that it is
  important that we not break the MOM6 code for them, and Alistair
  concurs.
    We are happy using new capabilities fro the shared code, but
  they have to be available via GitHub.  To test this, we propose
  that I am going to switch my testing procedures so that I pull my
  shared code from GitHub, and Alistair is going to keep using CVS,
  and we will document both shared code checkout options on the MOM6
  wiki page.  (I realize that this is more work, but it should only
  last until the shared code is fully migrated over to GitHub, and
  it seems better to start to test it now.)
    Please let me know if this sounds like a reasonable idea.  If we
  have your buy-in, I will take care of the pull request as soon as
  we have a working checkout procedure for the right version of the
  shared code via GitHub.
    - Bob Hallberg Dr. Robert Hallberg

Oceanographer and Ocean Group Head
NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508
Princeton University Forrestal Campus || Home: (732) 463-1274
201 Forrestal Road || Fax: (609) 987-5063
Princeton, New Jersey 08540-6649 || Email: [email protected]

  On 07/14/2014 08:06 PM, Zhi Liang wrote:
Hi Bob,

  Sorry I forgot to mention the shared codes update. The following
  shared

  codes will work

  cvs co -r tikal_201406 shared

  cvs up -r tikal_group_update_fix_z1l

  shared/mpp/include/mpp_domains_misc.inc

  cvs up -r tikal_group_update_fix_z1l

  shared/mpp/include/mpp_domains_util.inc

  cvs up -r tikal_group_update_fix_z1l
  shared/mpp/include/mpp_group_update.h

  cvs up -r tikal_group_update_fix_z1l shared/mpp/mpp_domains.F90

  cvs up -r tikal_group_update_fix_z1l
  shared/mpp/test_mpp_domains.F90

  These fixes is to make non-blocking halo pass to work. I only
  tested the

  block version before tikal_201406.

  If you do not want to update to tikal_group_update_fix_z1l, we may
  wait

  until the next patch release ( At that time,

  I will merge user/z1l/group_pass with dev/master).

  Thanks.

  Zhi

  On Mon, Jul 14, 2014 at 7:25 PM, Robert Hallberg
  <[email protected]>

  wrote:

  >

  > This pull request appears to require

  > an update of the mpp shared code beyond tikal_201403. It
  failed to

  > compile when I ran the commands as written.

  > - Bob Hallberg Dr. Robert Hallberg

  > Oceanographer and Ocean Group Head

  > NOAA Geophysical Fluid Dynamics Laboratory

  >

  > NOAA GFDL || Phone: (609) 452-6508

  > Princeton University Forrestal Campus || Home: (732) 463-1274

  > 201 Forrestal Road || Fax: (609) 987-5063

  > Princeton, New Jersey 08540-6649 || Email:
  [email protected]

  >

  >

  > On 07/14/2014 05:17 PM, Alistair Adcroft (GFDL) wrote:

  >

  > Bob, Note that this includes the commits in pull request #32
  + one other

  > commit efd6249. I'm not sure but I think

  > that handling this pull request will automatically handle #32
  because

  > github pull requests are based on refs. To save time, try

  > handling #33 first.

  > Request #32 is based on

  > the ref c152896 which is second to l

  > ast in this request. If handling #33 doesn't

  > close #32 then we'll

  > just close the other by hand.

  > This will be an interesting experiment with github and we are

  > watching your handling of the pull request with great
  interest -

  > no pressure! :^)

  > —

  > Reply to this email directly or view

  > it on GitHub.

  >

  > —

  > Reply to this email directly or view it on GitHub

  >

#33 (comment)
> .

  >
  —
    Reply to this email directly or view
      it on GitHub.

@Zhi-Liang
Copy link
Contributor Author

Hi Bob,

I think this is a good idea. I will check in updates in shared codes in
github.

Zhi

On Tue, Jul 15, 2014 at 9:57 AM, Robert Hallberg [email protected]
wrote:

Hi Zhi,
We have several MOM6 readers outside of GFDL who only have
access to the MOM6 and shared code via GitHub. I think that it is
important that we not break the MOM6 code for them, and Alistair
concurs.
We are happy using new capabilities fro the shared code, but
they have to be available via GitHub. To test this, we propose
that I am going to switch my testing procedures so that I pull my
shared code from GitHub, and Alistair is going to keep using CVS,
and we will document both shared code checkout options on the MOM6
wiki page. (I realize that this is more work, but it should only
last until the shared code is fully migrated over to GitHub, and
it seems better to start to test it now.)
Please let me know if this sounds like a reasonable idea. If we
have your buy-in, I will take care of the pull request as soon as
we have a working checkout procedure for the right version of the
shared code via GitHub.

  • Bob Hallberg Dr. Robert Hallberg
    Oceanographer and Ocean Group Head
    NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508
Princeton University Forrestal Campus || Home: (732) 463-1274
201 Forrestal Road || Fax: (609) 987-5063
Princeton, New Jersey 08540-6649 || Email: [email protected]

On 07/14/2014 08:06 PM, Zhi Liang wrote:
Hi Bob,

Sorry I forgot to mention the shared codes update. The following
shared

codes will work

cvs co -r tikal_201406 shared

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_misc.inc

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_util.inc

cvs up -r tikal_group_update_fix_z1l
shared/mpp/include/mpp_group_update.h

cvs up -r tikal_group_update_fix_z1l shared/mpp/mpp_domains.F90

cvs up -r tikal_group_update_fix_z1l
shared/mpp/test_mpp_domains.F90

These fixes is to make non-blocking halo pass to work. I only
tested the

block version before tikal_201406.

If you do not want to update to tikal_group_update_fix_z1l, we may
wait

until the next patch release ( At that time,

I will merge user/z1l/group_pass with dev/master).

Thanks.

Zhi

On Mon, Jul 14, 2014 at 7:25 PM, Robert Hallberg
[email protected]

wrote:

This pull request appears to require

an update of the mpp shared code beyond tikal_201403. It
failed to

compile when I ran the commands as written.

  • Bob Hallberg Dr. Robert Hallberg

Oceanographer and Ocean Group Head

NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508

Princeton University Forrestal Campus || Home: (732) 463-1274

201 Forrestal Road || Fax: (609) 987-5063

Princeton, New Jersey 08540-6649 || Email:
[email protected]

On 07/14/2014 05:17 PM, Alistair Adcroft (GFDL) wrote:

Bob, Note that this includes the commits in pull request #32

  • one other

commit efd6249. I'm not sure but I think

that handling this pull request will automatically handle #32
because

github pull requests are based on refs. To save time, try

handling #33 first.

Request #32 is based on

the ref c152896 which is second to l

ast in this request. If handling #33 doesn't

close #32 then we'll

just close the other by hand.

This will be an interesting experiment with github and we are

watching your handling of the pull request with great
interest -

no pressure! :^)

Reply to this email directly or view

it on GitHub.

Reply to this email directly or view it on GitHub

<
#33 (comment)

.


Reply to this email directly or view
it on GitHub.


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

@adcroft
Copy link
Collaborator

adcroft commented Jul 15, 2014

Did you mean gitlab? -A.

Dr Alistair Adcroft ([email protected])
Princeton University Tel: (609) 987-5073
NOAA/GFDL, 201 Forrestal Road, Princeton, NJ 08540

On Tue, Jul 15, 2014 at 10:21 AM, Zhi Liang [email protected]
wrote:

Hi Bob,

I think this is a good idea. I will check in updates in shared codes in
github.

Zhi

On Tue, Jul 15, 2014 at 9:57 AM, Robert Hallberg [email protected]

wrote:

Hi Zhi,
We have several MOM6 readers outside of GFDL who only have
access to the MOM6 and shared code via GitHub. I think that it is
important that we not break the MOM6 code for them, and Alistair
concurs.
We are happy using new capabilities fro the shared code, but
they have to be available via GitHub. To test this, we propose
that I am going to switch my testing procedures so that I pull my
shared code from GitHub, and Alistair is going to keep using CVS,
and we will document both shared code checkout options on the MOM6
wiki page. (I realize that this is more work, but it should only
last until the shared code is fully migrated over to GitHub, and
it seems better to start to test it now.)
Please let me know if this sounds like a reasonable idea. If we
have your buy-in, I will take care of the pull request as soon as
we have a working checkout procedure for the right version of the
shared code via GitHub.

  • Bob Hallberg Dr. Robert Hallberg
    Oceanographer and Ocean Group Head
    NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508
Princeton University Forrestal Campus || Home: (732) 463-1274
201 Forrestal Road || Fax: (609) 987-5063
Princeton, New Jersey 08540-6649 || Email: [email protected]

On 07/14/2014 08:06 PM, Zhi Liang wrote:
Hi Bob,

Sorry I forgot to mention the shared codes update. The following
shared

codes will work

cvs co -r tikal_201406 shared

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_misc.inc

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_util.inc

cvs up -r tikal_group_update_fix_z1l
shared/mpp/include/mpp_group_update.h

cvs up -r tikal_group_update_fix_z1l shared/mpp/mpp_domains.F90

cvs up -r tikal_group_update_fix_z1l
shared/mpp/test_mpp_domains.F90

These fixes is to make non-blocking halo pass to work. I only
tested the

block version before tikal_201406.

If you do not want to update to tikal_group_update_fix_z1l, we may
wait

until the next patch release ( At that time,

I will merge user/z1l/group_pass with dev/master).

Thanks.

Zhi

On Mon, Jul 14, 2014 at 7:25 PM, Robert Hallberg
[email protected]

wrote:

This pull request appears to require

an update of the mpp shared code beyond tikal_201403. It
failed to

compile when I ran the commands as written.

  • Bob Hallberg Dr. Robert Hallberg

Oceanographer and Ocean Group Head

NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508

Princeton University Forrestal Campus || Home: (732) 463-1274

201 Forrestal Road || Fax: (609) 987-5063

Princeton, New Jersey 08540-6649 || Email:
[email protected]

On 07/14/2014 05:17 PM, Alistair Adcroft (GFDL) wrote:

Bob, Note that this includes the commits in pull request #32

  • one other

commit efd6249. I'm not sure but I think

that handling this pull request will automatically handle #32
because

github pull requests are based on refs. To save time, try

handling #33 first.

Request #32 is based on

the ref c152896 which is second to l

ast in this request. If handling #33 doesn't

close #32 then we'll

just close the other by hand.

This will be an interesting experiment with github and we are

watching your handling of the pull request with great
interest -

no pressure! :^)

Reply to this email directly or view

it on GitHub.

Reply to this email directly or view it on GitHub

<

#33 (comment)

.


Reply to this email directly or view
it on GitHub.


Reply to this email directly or view it on GitHub
<
https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49034803>

.


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

@Zhi-Liang
Copy link
Contributor Author

Hi Alistair,

I thought github and gitlab are synchronized. I will check in either
gitlab or github.

Zhi

On Tue, Jul 15, 2014 at 10:30 AM, Alistair Adcroft (GFDL) <
[email protected]> wrote:

Did you mean gitlab? -A.

Dr Alistair Adcroft ([email protected])
Princeton University Tel: (609) 987-5073
NOAA/GFDL, 201 Forrestal Road, Princeton, NJ 08540

On Tue, Jul 15, 2014 at 10:21 AM, Zhi Liang [email protected]
wrote:

Hi Bob,

I think this is a good idea. I will check in updates in shared codes in
github.

Zhi

On Tue, Jul 15, 2014 at 9:57 AM, Robert Hallberg <
[email protected]>

wrote:

Hi Zhi,
We have several MOM6 readers outside of GFDL who only have
access to the MOM6 and shared code via GitHub. I think that it is
important that we not break the MOM6 code for them, and Alistair
concurs.
We are happy using new capabilities fro the shared code, but
they have to be available via GitHub. To test this, we propose
that I am going to switch my testing procedures so that I pull my
shared code from GitHub, and Alistair is going to keep using CVS,
and we will document both shared code checkout options on the MOM6
wiki page. (I realize that this is more work, but it should only
last until the shared code is fully migrated over to GitHub, and
it seems better to start to test it now.)
Please let me know if this sounds like a reasonable idea. If we
have your buy-in, I will take care of the pull request as soon as
we have a working checkout procedure for the right version of the
shared code via GitHub.

  • Bob Hallberg Dr. Robert Hallberg
    Oceanographer and Ocean Group Head
    NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508
Princeton University Forrestal Campus || Home: (732) 463-1274
201 Forrestal Road || Fax: (609) 987-5063
Princeton, New Jersey 08540-6649 || Email: [email protected]

On 07/14/2014 08:06 PM, Zhi Liang wrote:
Hi Bob,

Sorry I forgot to mention the shared codes update. The following
shared

codes will work

cvs co -r tikal_201406 shared

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_misc.inc

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_util.inc

cvs up -r tikal_group_update_fix_z1l
shared/mpp/include/mpp_group_update.h

cvs up -r tikal_group_update_fix_z1l shared/mpp/mpp_domains.F90

cvs up -r tikal_group_update_fix_z1l
shared/mpp/test_mpp_domains.F90

These fixes is to make non-blocking halo pass to work. I only
tested the

block version before tikal_201406.

If you do not want to update to tikal_group_update_fix_z1l, we may
wait

until the next patch release ( At that time,

I will merge user/z1l/group_pass with dev/master).

Thanks.

Zhi

On Mon, Jul 14, 2014 at 7:25 PM, Robert Hallberg
[email protected]

wrote:

This pull request appears to require

an update of the mpp shared code beyond tikal_201403. It
failed to

compile when I ran the commands as written.

  • Bob Hallberg Dr. Robert Hallberg

Oceanographer and Ocean Group Head

NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508

Princeton University Forrestal Campus || Home: (732) 463-1274

201 Forrestal Road || Fax: (609) 987-5063

Princeton, New Jersey 08540-6649 || Email:
[email protected]

On 07/14/2014 05:17 PM, Alistair Adcroft (GFDL) wrote:

Bob, Note that this includes the commits in pull request #32

  • one other

commit efd6249. I'm not sure but I think

that handling this pull request will automatically handle #32
because

github pull requests are based on refs. To save time, try

handling #33 first.

Request #32 is based on

the ref c152896 which is second to l

ast in this request. If handling #33 doesn't

close #32 then we'll

just close the other by hand.

This will be an interesting experiment with github and we are

watching your handling of the pull request with great
interest -

no pressure! :^)

Reply to this email directly or view

it on GitHub.

Reply to this email directly or view it on GitHub

<

#33 (comment)

.


Reply to this email directly or view
it on GitHub.


Reply to this email directly or view it on GitHub
<

https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49034803>

.


Reply to this email directly or view it on GitHub
<
https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49038359>

.


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

@adcroft
Copy link
Collaborator

adcroft commented Jul 15, 2014

We'll have to check with Seth/Balaji - I think committing directly to the
git repositories that are essentially mirroring CVS could lead to an
unmanageable mess. I think Seth might be doing some automatic syncing
somewhere but let him tell us how we should do this. -A.

Dr Alistair Adcroft ([email protected])
Princeton University Tel: (609) 987-5073
NOAA/GFDL, 201 Forrestal Road, Princeton, NJ 08540

On Tue, Jul 15, 2014 at 10:36 AM, Zhi Liang [email protected]
wrote:

Hi Alistair,

I thought github and gitlab are synchronized. I will check in either
gitlab or github.

Zhi

On Tue, Jul 15, 2014 at 10:30 AM, Alistair Adcroft (GFDL) <
[email protected]> wrote:

Did you mean gitlab? -A.

Dr Alistair Adcroft ([email protected])
Princeton University Tel: (609) 987-5073
NOAA/GFDL, 201 Forrestal Road, Princeton, NJ 08540

On Tue, Jul 15, 2014 at 10:21 AM, Zhi Liang [email protected]
wrote:

Hi Bob,

I think this is a good idea. I will check in updates in shared codes
in
github.

Zhi

On Tue, Jul 15, 2014 at 9:57 AM, Robert Hallberg <
[email protected]>

wrote:

Hi Zhi,
We have several MOM6 readers outside of GFDL who only have
access to the MOM6 and shared code via GitHub. I think that it is
important that we not break the MOM6 code for them, and Alistair
concurs.
We are happy using new capabilities fro the shared code, but
they have to be available via GitHub. To test this, we propose
that I am going to switch my testing procedures so that I pull my
shared code from GitHub, and Alistair is going to keep using CVS,
and we will document both shared code checkout options on the MOM6
wiki page. (I realize that this is more work, but it should only
last until the shared code is fully migrated over to GitHub, and
it seems better to start to test it now.)
Please let me know if this sounds like a reasonable idea. If we
have your buy-in, I will take care of the pull request as soon as
we have a working checkout procedure for the right version of the
shared code via GitHub.

  • Bob Hallberg Dr. Robert Hallberg
    Oceanographer and Ocean Group Head
    NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508
Princeton University Forrestal Campus || Home: (732) 463-1274
201 Forrestal Road || Fax: (609) 987-5063
Princeton, New Jersey 08540-6649 || Email: [email protected]

On 07/14/2014 08:06 PM, Zhi Liang wrote:
Hi Bob,

Sorry I forgot to mention the shared codes update. The following
shared

codes will work

cvs co -r tikal_201406 shared

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_misc.inc

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_util.inc

cvs up -r tikal_group_update_fix_z1l
shared/mpp/include/mpp_group_update.h

cvs up -r tikal_group_update_fix_z1l shared/mpp/mpp_domains.F90

cvs up -r tikal_group_update_fix_z1l
shared/mpp/test_mpp_domains.F90

These fixes is to make non-blocking halo pass to work. I only
tested the

block version before tikal_201406.

If you do not want to update to tikal_group_update_fix_z1l, we may
wait

until the next patch release ( At that time,

I will merge user/z1l/group_pass with dev/master).

Thanks.

Zhi

On Mon, Jul 14, 2014 at 7:25 PM, Robert Hallberg
[email protected]

wrote:

This pull request appears to require

an update of the mpp shared code beyond tikal_201403. It
failed to

compile when I ran the commands as written.

  • Bob Hallberg Dr. Robert Hallberg

Oceanographer and Ocean Group Head

NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508

Princeton University Forrestal Campus || Home: (732) 463-1274

201 Forrestal Road || Fax: (609) 987-5063

Princeton, New Jersey 08540-6649 || Email:
[email protected]

On 07/14/2014 05:17 PM, Alistair Adcroft (GFDL) wrote:

Bob, Note that this includes the commits in pull request #32

  • one other

commit efd6249. I'm not sure but I think

that handling this pull request will automatically handle #32
because

github pull requests are based on refs. To save time, try

handling #33 first.

Request #32 is based on

the ref c152896 which is second to l

ast in this request. If handling #33 doesn't

close #32 then we'll

just close the other by hand.

This will be an interesting experiment with github and we are

watching your handling of the pull request with great
interest -

no pressure! :^)

Reply to this email directly or view

it on GitHub.

Reply to this email directly or view it on GitHub

<

#33 (comment)

.


Reply to this email directly or view
it on GitHub.


Reply to this email directly or view it on GitHub
<

https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49034803>

.


Reply to this email directly or view it on GitHub
<

https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49038359>

.


Reply to this email directly or view it on GitHub
<
https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49039624>

.


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

@adcroft
Copy link
Collaborator

adcroft commented Jul 15, 2014

The github version of shared will be a mirror of the gitlab version. So
when we have an official gitlab version, please push all updates to gitlab.

Currently we don't have an official gitlab version of shared. I will
manually push the updates out to the github shared.

Doing both CVS and git is not ideal, but as long as it isn't something that
I have to do often I think we can keep in in sync.

Seth Underwood
Engility
High Technology Services Group

Modeling Services Group
GFDL/NOAA/DOC
201 Forrestal Road
Princeton, NJ 08540-6649

(609) 452-5847 Office
(304) 376-9002 Cell
(609) 987-5063 Fax
[email protected]

On Tue, Jul 15, 2014 at 10:48 AM, Alistair Adcroft - NOAA Affiliate <
[email protected]> wrote:

We'll have to check with Seth/Balaji - I think committing directly to the
git repositories that are essentially mirroring CVS could lead to an
unmanageable mess. I think Seth might be doing some automatic syncing
somewhere but let him tell us how we should do this. -A.

Dr Alistair Adcroft ([email protected])
Princeton University Tel: (609) 987-5073
NOAA/GFDL, 201 Forrestal Road, Princeton, NJ 08540

On Tue, Jul 15, 2014 at 10:36 AM, Zhi Liang [email protected]
wrote:

Hi Alistair,

I thought github and gitlab are synchronized. I will check in either
gitlab or github.

Zhi

On Tue, Jul 15, 2014 at 10:30 AM, Alistair Adcroft (GFDL) <
[email protected]> wrote:

Did you mean gitlab? -A.

Dr Alistair Adcroft ([email protected])
Princeton University Tel: (609) 987-5073
NOAA/GFDL, 201 Forrestal Road, Princeton, NJ 08540

On Tue, Jul 15, 2014 at 10:21 AM, Zhi Liang [email protected]
wrote:

Hi Bob,

I think this is a good idea. I will check in updates in shared codes
in
github.

Zhi

On Tue, Jul 15, 2014 at 9:57 AM, Robert Hallberg <
[email protected]>

wrote:

Hi Zhi,
We have several MOM6 readers outside of GFDL who only have
access to the MOM6 and shared code via GitHub. I think that it is
important that we not break the MOM6 code for them, and Alistair
concurs.
We are happy using new capabilities fro the shared code, but
they have to be available via GitHub. To test this, we propose
that I am going to switch my testing procedures so that I pull my
shared code from GitHub, and Alistair is going to keep using CVS,
and we will document both shared code checkout options on the MOM6
wiki page. (I realize that this is more work, but it should only
last until the shared code is fully migrated over to GitHub, and
it seems better to start to test it now.)
Please let me know if this sounds like a reasonable idea. If we
have your buy-in, I will take care of the pull request as soon as
we have a working checkout procedure for the right version of the
shared code via GitHub.

  • Bob Hallberg Dr. Robert Hallberg
    Oceanographer and Ocean Group Head
    NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508
Princeton University Forrestal Campus || Home: (732) 463-1274
201 Forrestal Road || Fax: (609) 987-5063
Princeton, New Jersey 08540-6649 || Email: [email protected]

On 07/14/2014 08:06 PM, Zhi Liang wrote:
Hi Bob,

Sorry I forgot to mention the shared codes update. The following
shared

codes will work

cvs co -r tikal_201406 shared

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_misc.inc

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_util.inc

cvs up -r tikal_group_update_fix_z1l
shared/mpp/include/mpp_group_update.h

cvs up -r tikal_group_update_fix_z1l shared/mpp/mpp_domains.F90

cvs up -r tikal_group_update_fix_z1l
shared/mpp/test_mpp_domains.F90

These fixes is to make non-blocking halo pass to work. I only
tested the

block version before tikal_201406.

If you do not want to update to tikal_group_update_fix_z1l, we may
wait

until the next patch release ( At that time,

I will merge user/z1l/group_pass with dev/master).

Thanks.

Zhi

On Mon, Jul 14, 2014 at 7:25 PM, Robert Hallberg
[email protected]

wrote:

This pull request appears to require

an update of the mpp shared code beyond tikal_201403. It
failed to

compile when I ran the commands as written.

  • Bob Hallberg Dr. Robert Hallberg

Oceanographer and Ocean Group Head

NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508

Princeton University Forrestal Campus || Home: (732) 463-1274

201 Forrestal Road || Fax: (609) 987-5063

Princeton, New Jersey 08540-6649 || Email:
[email protected]

On 07/14/2014 05:17 PM, Alistair Adcroft (GFDL) wrote:

Bob, Note that this includes the commits in pull request #32

  • one other

commit efd6249. I'm not sure but I think

that handling this pull request will automatically handle #32
because

github pull requests are based on refs. To save time, try

handling #33 first.

Request #32 is based on

the ref c152896 which is second to l

ast in this request. If handling #33 doesn't

close #32 then we'll

just close the other by hand.

This will be an interesting experiment with github and we are

watching your handling of the pull request with great
interest -

no pressure! :^)

Reply to this email directly or view

it on GitHub.

Reply to this email directly or view it on GitHub

<

#33 (comment)

.


Reply to this email directly or view
it on GitHub.


Reply to this email directly or view it on GitHub
<

https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49034803>

.


Reply to this email directly or view it on GitHub
<

https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49038359>

.


Reply to this email directly or view it on GitHub
<
https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49039624>

.


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

@adcroft
Copy link
Collaborator

adcroft commented Jul 15, 2014

The frequency will be higher than the released patches but hopefully longer
than weekly.

-A.

Dr Alistair Adcroft ([email protected])
Princeton University Tel: (609) 987-5073
NOAA/GFDL, 201 Forrestal Road, Princeton, NJ 08540

On Tue, Jul 15, 2014 at 11:01 AM, Seth Underwood - NOAA Affiliate <
[email protected]> wrote:

The github version of shared will be a mirror of the gitlab version. So
when we have an official gitlab version, please push all updates to gitlab.

Currently we don't have an official gitlab version of shared. I will
manually push the updates out to the github shared.

Doing both CVS and git is not ideal, but as long as it isn't something
that I have to do often I think we can keep in in sync.

Seth Underwood
Engility
High Technology Services Group

Modeling Services Group
GFDL/NOAA/DOC
201 Forrestal Road
Princeton, NJ 08540-6649

(609) 452-5847 Office
(304) 376-9002 Cell
(609) 987-5063 Fax
[email protected]

On Tue, Jul 15, 2014 at 10:48 AM, Alistair Adcroft - NOAA Affiliate <
[email protected]> wrote:

We'll have to check with Seth/Balaji - I think committing directly to the
git repositories that are essentially mirroring CVS could lead to an
unmanageable mess. I think Seth might be doing some automatic syncing
somewhere but let him tell us how we should do this. -A.

Dr Alistair Adcroft ([email protected])
Princeton University Tel: (609) 987-5073
NOAA/GFDL, 201 Forrestal Road, Princeton, NJ 08540

On Tue, Jul 15, 2014 at 10:36 AM, Zhi Liang [email protected]
wrote:

Hi Alistair,

I thought github and gitlab are synchronized. I will check in either
gitlab or github.

Zhi

On Tue, Jul 15, 2014 at 10:30 AM, Alistair Adcroft (GFDL) <
[email protected]> wrote:

Did you mean gitlab? -A.

Dr Alistair Adcroft ([email protected])
Princeton University Tel: (609) 987-5073
NOAA/GFDL, 201 Forrestal Road, Princeton, NJ 08540

On Tue, Jul 15, 2014 at 10:21 AM, Zhi Liang [email protected]

wrote:

Hi Bob,

I think this is a good idea. I will check in updates in shared codes
in
github.

Zhi

On Tue, Jul 15, 2014 at 9:57 AM, Robert Hallberg <
[email protected]>

wrote:

Hi Zhi,
We have several MOM6 readers outside of GFDL who only have
access to the MOM6 and shared code via GitHub. I think that it is
important that we not break the MOM6 code for them, and Alistair
concurs.
We are happy using new capabilities fro the shared code, but
they have to be available via GitHub. To test this, we propose
that I am going to switch my testing procedures so that I pull my
shared code from GitHub, and Alistair is going to keep using CVS,
and we will document both shared code checkout options on the MOM6
wiki page. (I realize that this is more work, but it should only
last until the shared code is fully migrated over to GitHub, and
it seems better to start to test it now.)
Please let me know if this sounds like a reasonable idea. If we
have your buy-in, I will take care of the pull request as soon as
we have a working checkout procedure for the right version of the
shared code via GitHub.

  • Bob Hallberg Dr. Robert Hallberg
    Oceanographer and Ocean Group Head
    NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508
Princeton University Forrestal Campus || Home: (732) 463-1274
201 Forrestal Road || Fax: (609) 987-5063
Princeton, New Jersey 08540-6649 || Email:
[email protected]

On 07/14/2014 08:06 PM, Zhi Liang wrote:
Hi Bob,

Sorry I forgot to mention the shared codes update. The following
shared

codes will work

cvs co -r tikal_201406 shared

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_misc.inc

cvs up -r tikal_group_update_fix_z1l

shared/mpp/include/mpp_domains_util.inc

cvs up -r tikal_group_update_fix_z1l
shared/mpp/include/mpp_group_update.h

cvs up -r tikal_group_update_fix_z1l shared/mpp/mpp_domains.F90

cvs up -r tikal_group_update_fix_z1l
shared/mpp/test_mpp_domains.F90

These fixes is to make non-blocking halo pass to work. I only
tested the

block version before tikal_201406.

If you do not want to update to tikal_group_update_fix_z1l, we may
wait

until the next patch release ( At that time,

I will merge user/z1l/group_pass with dev/master).

Thanks.

Zhi

On Mon, Jul 14, 2014 at 7:25 PM, Robert Hallberg
[email protected]

wrote:

This pull request appears to require

an update of the mpp shared code beyond tikal_201403. It
failed to

compile when I ran the commands as written.

  • Bob Hallberg Dr. Robert Hallberg

Oceanographer and Ocean Group Head

NOAA Geophysical Fluid Dynamics Laboratory

NOAA GFDL || Phone: (609) 452-6508

Princeton University Forrestal Campus || Home: (732) 463-1274

201 Forrestal Road || Fax: (609) 987-5063

Princeton, New Jersey 08540-6649 || Email:
[email protected]

On 07/14/2014 05:17 PM, Alistair Adcroft (GFDL) wrote:

Bob, Note that this includes the commits in pull request #32

  • one other

commit efd6249. I'm not sure but I think

that handling this pull request will automatically handle #32
because

github pull requests are based on refs. To save time, try

handling #33 first.

Request #32 is based on

the ref c152896 which is second to l

ast in this request. If handling #33 doesn't

close #32 then we'll

just close the other by hand.

This will be an interesting experiment with github and we are

watching your handling of the pull request with great
interest -

no pressure! :^)

Reply to this email directly or view

it on GitHub.

Reply to this email directly or view it on GitHub

<

#33 (comment)

.


Reply to this email directly or view
it on GitHub.


Reply to this email directly or view it on GitHub
<

https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49034803>

.


Reply to this email directly or view it on GitHub
<

https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49038359>

.


Reply to this email directly or view it on GitHub
<
https://github.com/CommerceGov/NOAA-GFDL-MOM6/pull/33#issuecomment-49039624>

.


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

@adcroft
Copy link
Collaborator

adcroft commented Jul 18, 2014

Bob,

Seth HAS pushed the necessary FMS updates to the github so external users can now get the code. I'll post the necessary steps on the github wiki and send out an email to all later. In the meantime, you can process this PR.

-A.

@adcroft
Copy link
Collaborator

adcroft commented Jul 21, 2014

Zhi,

Bob found answer changes with this PR for the following experiments:

solo_ocean/flow_downslope/layer
solo_ocean/flow_downslope/rho
solo_ocean/flow_downslope/sigma
solo_ocean/flow_downslope/z
solo_ocean/seamount/layer
solo_ocean/seamount/sigma
solo_ocean/seamount/z
solo_ocean/sloshing/layer
solo_ocean/sloshing/rho
solo_ocean/sloshing/z

I checked also and concur that the above have different results. Any idea why?

-A.

@Zhi-Liang
Copy link
Contributor Author

Hi Alistair,

I will find out the reason.

Zhi

On Mon, Jul 21, 2014 at 12:18 PM, Alistair Adcroft (GFDL) <
[email protected]> wrote:

Zhi,

Bob found answer changes with this PR for the following experiments:

solo_ocean/flow_downslope/layer
solo_ocean/flow_downslope/rho
solo_ocean/flow_downslope/sigma
solo_ocean/flow_downslope/z
solo_ocean/seamount/layer
solo_ocean/seamount/sigma
solo_ocean/seamount/z
solo_ocean/sloshing/layer
solo_ocean/sloshing/rho
solo_ocean/sloshing/z

I checked also and concur that the above have different results. Any idea
why?

-A.


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

@Zhi-Liang
Copy link
Contributor Author

Hi Alistair,

I figured out the reason. This is a change I made in the branch
user/z1l/openmp and brought into branch
user/z1l/group_pass. I pushed the fix in both branches. All the above tests
reproduce answer of dev/master. I will test more experiments in the future
when I push in new changes.

Zhi

On Mon, Jul 21, 2014 at 12:18 PM, Alistair Adcroft (GFDL) <
[email protected]> wrote:

Zhi,

Bob found answer changes with this PR for the following experiments:

solo_ocean/flow_downslope/layer
solo_ocean/flow_downslope/rho
solo_ocean/flow_downslope/sigma
solo_ocean/flow_downslope/z
solo_ocean/seamount/layer
solo_ocean/seamount/sigma
solo_ocean/seamount/z
solo_ocean/sloshing/layer
solo_ocean/sloshing/rho
solo_ocean/sloshing/z

I checked also and concur that the above have different results. Any idea
why?

-A.


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

@adcroft
Copy link
Collaborator

adcroft commented Jul 21, 2014

Those three were fixed but now solo_ocean/DOME is failing (unless I missed it last time)?

@Zhi-Liang
Copy link
Contributor Author

Hi Alistair,

I will find out the reason.

Thanks,

Zhi

On Mon, Jul 21, 2014 at 4:59 PM, Alistair Adcroft (GFDL) <
[email protected]> wrote:

Those three were fixed but now solo_ocean/DOME is failing (unless I missed
it last time)?


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

@Zhi-Liang
Copy link
Contributor Author

Hi Alistair,

I made a fix in MOM_barotropic.F90 (OBC related) and all the solo
experiments (I got the frerts command from Niki) passed. I also tested a
few sea-ice model, ocean_SIS/OM4_025,
GOLD_SIS_025 and ocean_SIS2/SIS2 and all passed.

Zhi

On Mon, Jul 21, 2014 at 5:16 PM, Zhi Liang - NOAA Affiliate <
[email protected]> wrote:

Hi Alistair,

I will find out the reason.

Thanks,

Zhi

On Mon, Jul 21, 2014 at 4:59 PM, Alistair Adcroft (GFDL) <
[email protected]> wrote:

Those three were fixed but now solo_ocean/DOME is failing (unless I
missed it last time)?


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

@adcroft adcroft merged commit 48b7217 into dev/master Jul 22, 2014
@adcroft adcroft deleted the user/z1l/group_pass branch July 29, 2016 18:42
nikizadehgfdl pushed a commit to nikizadehgfdl/MOM6 that referenced this pull request Oct 9, 2017
- Updated SIS_parameter_doc files.
- No answer changes.

- NOAA-GFDL/SIS2@66b25e2 Merge branch 'user/nnz/fix_k_loop' into dev/master
- NOAA-GFDL/SIS2@41e9b4c Merge branch 'dev/master' into user/nnz/fix_k_loop
- NOAA-GFDL/SIS2@53991cd This fixes issue mom-ocean#33
- NOAA-GFDL/SIS2@eff04b1 Merge branch 'ashao-dev/master' into dev/master
- NOAA-GFDL/SIS2@5abfb11 Merge branch 'dev/master' of https://github.com/ashao/SIS2 into ashao-dev/master
- NOAA-GFDL/SIS2@947eca6 Explicitly initialize all of domore_u and domore_v
SMoorthi-emc pushed a commit to SMoorthi-emc/MOM6 that referenced this pull request Sep 12, 2020
* use flag to control lag startup

* additional log msg cleanup

* clarify restart_mode control
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Jun 15, 2021
- The loop for k was missing
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
The old length (128) of standard_name is now too short.  Increasing it
to 256 for CMIP6 runs.

Resloves mom-ocean#33
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.

4 participants