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

Merge gsd/develop, restore GNU portability #8

Merged

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Sep 4, 2019

  • merge gsd/develop (no changes)
  • restore portability for GNU compiler

See https://github.com/NCAR/NEMSfv3gfs/pull/243 for regression testing.

@climbfuji
Copy link
Collaborator Author

Copy link

@grantfirl grantfirl left a comment

Choose a reason for hiding this comment

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

Approved

@climbfuji climbfuji merged commit c9d7d00 into NCAR:gmtb/develop Sep 9, 2019
climbfuji pushed a commit to climbfuji/NEMS that referenced this pull request Sep 9, 2019
commit c9d7d00
Merge: 57d5044 02f3319
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Sun Sep 8 20:32:11 2019 -0600

    Merge pull request NCAR#8 from climbfuji/gmtb_develop_monster_merge_20190904

    Merge gsd/develop, restore GNU portability

commit 02f3319
Merge: abe9efb d1be445
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Sep 4 09:04:52 2019 -0600

    Merge branch 'gsd/develop' of https://github.com/NCAR/NEMS into gmtb_develop_update_from_master_20190830

commit abe9efb
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Sep 3 16:25:12 2019 -0600

    src/module_MEDIATOR.F90: fix invalid Fortran code for GNU compiler

commit 57d5044
Merge: 71a4c82 2327dae
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Sep 3 09:20:02 2019 -0600

    Merge pull request NCAR#7 from climbfuji/gmtb_develop_update_from_master_20190830

    gmtb/develop: update from master 2019/08/30

commit 2327dae
Author: Ratko Vasic <ratko.vasic@noaa.gov>
Date:   Fri Aug 30 19:16:52 2019 +0000

    Posrt 2 hera

commit e638b7e
Author: Raffaele Montuoro <raffaele.montuoro@noaa.gov>
Date:   Thu Aug 22 20:42:22 2019 +0000

    Add standard name to NUOPC Field Dictionary
    defining instantaneous specific humidity
    tendency due to convection.

commit c3ec2c4
Author: Gerhard Theurich <gerhard.j.theurich@noaa.gov>
Date:   Wed Aug 21 23:26:44 2019 +0000

    Support the official NUOPC Verbosity strings "off", "low", "high", "max" for compliance.

commit 71a4c82
Merge: fd81084 89ddf13
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Aug 30 07:39:05 2019 -0600

    Merge pull request NCAR#3 from climbfuji/bugfix_nemscompsetrun

    Bugfix for NemsCompset detection of Theia/Hera

commit fd81084
Merge: 283eeb1 053bd17
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Aug 29 15:35:33 2019 -0600

    Merge pull request NCAR#4 from grantfirl/gmtb/develop

    add Julie as codeowner

commit 053bd17
Author: Grant Firl <grantf@ucar.edu>
Date:   Thu Aug 29 15:26:22 2019 -0600

    add Julie as codeowner

commit 89ddf13
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Aug 28 13:36:52 2019 -0600

    src/incmake/env/rdhpcs/detect.mk: bugfix for NEMSCompsetRun

commit 283eeb1
Merge: 1c71222 e142f4e
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Aug 27 15:45:57 2019 -0600

    Merge pull request NCAR#2 from climbfuji/hera_update_20190827

    gmtb/develop: update hera config

commit e142f4e
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Aug 27 15:04:16 2019 -0600

    src/incmake/env/rdhpcs/detect.mk: test for hostname prefix, since hera and theia both have /scratch1 through /scratch4 mounted

commit 028e1e8
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Aug 27 13:45:29 2019 -0600

    Update src/incmake/env/rdhpcs/detect.mk, src/conf/module-setup.csh.inc, src/conf/module-setup.sh.inc after move from Juno test system to Hera. Since /scratch4 from theia is also mounted on hera, need to switch the order of detection.

commit 1c71222
Merge: 6bf8109 5b244ab
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Sat Aug 17 16:25:57 2019 -0600

    Merge pull request NCAR#1 from climbfuji/hera_support

    Add support for hera/juno (theia successor)

commit 5b244ab
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Aug 16 09:33:34 2019 -0600

    Add support for hera/juno (theia successor)

commit d1be445
Author: Laurie Carson <carson@ucar.edu>
Date:   Fri Aug 16 09:01:15 2019 -0600

    Add CODEOWNERS for NCAR fork of NEMS repository

commit 766e0cd
Author: Laurie Carson <carson@ucar.edu>
Date:   Fri Aug 16 09:00:10 2019 -0600

    Add CODEOWNERS for NCAR fork of NEMS repository

commit 6bf8109
Author: Laurie Carson <carson@ucar.edu>
Date:   Fri Aug 16 08:59:16 2019 -0600

    Add CODEOWNERS for NCAR fork of NEMS repository
climbfuji pushed a commit to climbfuji/NEMS that referenced this pull request Sep 9, 2019
commit c9d7d00
Merge: 57d5044 02f3319
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Sun Sep 8 20:32:11 2019 -0600

    Merge pull request NCAR#8 from climbfuji/gmtb_develop_monster_merge_20190904

    Merge gsd/develop, restore GNU portability

commit 02f3319
Merge: abe9efb d1be445
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Sep 4 09:04:52 2019 -0600

    Merge branch 'gsd/develop' of https://github.com/NCAR/NEMS into gmtb_develop_update_from_master_20190830

commit abe9efb
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Sep 3 16:25:12 2019 -0600

    src/module_MEDIATOR.F90: fix invalid Fortran code for GNU compiler

commit 57d5044
Merge: 71a4c82 2327dae
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Sep 3 09:20:02 2019 -0600

    Merge pull request NCAR#7 from climbfuji/gmtb_develop_update_from_master_20190830

    gmtb/develop: update from master 2019/08/30

commit 2327dae
Author: Ratko Vasic <ratko.vasic@noaa.gov>
Date:   Fri Aug 30 19:16:52 2019 +0000

    Posrt 2 hera

commit e638b7e
Author: Raffaele Montuoro <raffaele.montuoro@noaa.gov>
Date:   Thu Aug 22 20:42:22 2019 +0000

    Add standard name to NUOPC Field Dictionary
    defining instantaneous specific humidity
    tendency due to convection.

commit c3ec2c4
Author: Gerhard Theurich <gerhard.j.theurich@noaa.gov>
Date:   Wed Aug 21 23:26:44 2019 +0000

    Support the official NUOPC Verbosity strings "off", "low", "high", "max" for compliance.

commit 71a4c82
Merge: fd81084 89ddf13
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Aug 30 07:39:05 2019 -0600

    Merge pull request NCAR#3 from climbfuji/bugfix_nemscompsetrun

    Bugfix for NemsCompset detection of Theia/Hera

commit fd81084
Merge: 283eeb1 053bd17
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Aug 29 15:35:33 2019 -0600

    Merge pull request NCAR#4 from grantfirl/gmtb/develop

    add Julie as codeowner

commit 053bd17
Author: Grant Firl <grantf@ucar.edu>
Date:   Thu Aug 29 15:26:22 2019 -0600

    add Julie as codeowner

commit 89ddf13
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Wed Aug 28 13:36:52 2019 -0600

    src/incmake/env/rdhpcs/detect.mk: bugfix for NEMSCompsetRun

commit 283eeb1
Merge: 1c71222 e142f4e
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Aug 27 15:45:57 2019 -0600

    Merge pull request NCAR#2 from climbfuji/hera_update_20190827

    gmtb/develop: update hera config

commit e142f4e
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Aug 27 15:04:16 2019 -0600

    src/incmake/env/rdhpcs/detect.mk: test for hostname prefix, since hera and theia both have /scratch1 through /scratch4 mounted

commit 028e1e8
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Tue Aug 27 13:45:29 2019 -0600

    Update src/incmake/env/rdhpcs/detect.mk, src/conf/module-setup.csh.inc, src/conf/module-setup.sh.inc after move from Juno test system to Hera. Since /scratch4 from theia is also mounted on hera, need to switch the order of detection.

commit 1c71222
Merge: 6bf8109 5b244ab
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Sat Aug 17 16:25:57 2019 -0600

    Merge pull request NCAR#1 from climbfuji/hera_support

    Add support for hera/juno (theia successor)

commit 5b244ab
Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date:   Fri Aug 16 09:33:34 2019 -0600

    Add support for hera/juno (theia successor)

commit d1be445
Author: Laurie Carson <carson@ucar.edu>
Date:   Fri Aug 16 09:01:15 2019 -0600

    Add CODEOWNERS for NCAR fork of NEMS repository

commit 766e0cd
Author: Laurie Carson <carson@ucar.edu>
Date:   Fri Aug 16 09:00:10 2019 -0600

    Add CODEOWNERS for NCAR fork of NEMS repository

commit 6bf8109
Author: Laurie Carson <carson@ucar.edu>
Date:   Fri Aug 16 08:59:16 2019 -0600

    Add CODEOWNERS for NCAR fork of NEMS repository
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