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.

Sign up for GitHub

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

Jump to bottom

gmtb/develop: update from master 2019/09/20 #10

Merged
merged 21 commits into from
Sep 23, 2019
Merged

gmtb/develop: update from master 2019/09/20 #10

merged 21 commits into from
Sep 23, 2019

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Sep 20, 2019 •
edited
Loading

Changes:

  • clean commit history by merging in "master" (=NOAA EMC GitHub develop branch)
  • updates from "master" are mainly related to chemical tracer transport

For regression testing, see https://github.com/NCAR/NEMSfv3gfs/pull/251

DeniseWorthen and others added 21 commits August 21, 2019 16:46
@DeniseWorthen
Weights mean_salt_rate by icewgt
b0183ea
@DeniseWorthen
Currently, rain is being merged with sea ice FW and sensible heat
00540f8 
from the ATM is being merged with the heat of sea ice formation
and melt. The newest MOM6 requires the fields of FW and heat
associated with sea ice melt or formation be sent as separate fields.
@theurich
Support the official NUOPC Verbosity strings "off", "low", "high", "m…
a27a80c 
…ax" for compliance.
@rmontuoro
Add standard name to NUOPC Field Dictionary
8113ca1 
defining instantaneous specific humidity
tendency due to convection.
@DeniseWorthen
adds 6 variables to NUOPC Dictionary which are needed by WW3-MOM6
95c63cb
@RatkoVasic-NOAA
Merge pull request NCAR#3 from theurich/update_esmf
d73108d 
Support the official NUOPC Verbosity strings
@RatkoVasic-NOAA
Merge pull request NCAR#4 from rmontuoro/develop
5390bea 
Add standard name to NUOPC Field Dictionary
@RatkoVasic-NOAA
Posrt 2 hera
44d7391
@RatkoVasic-NOAA
Merge pull request NCAR#5 from RatkoVasic-NOAA/port2hera
87da3d3 
Port 2 hera
@RatkoVasic-NOAA
Port 2 hera
be0dea9
@RatkoVasic-NOAA
Fix rtgen (path in decide_tmp_hera)
7b4fe82
@RatkoVasic-NOAA
Move produtil from vlab to github
32e84a6
@RatkoVasic-NOAA
point to port-2-hera branch
dbf0989
@RatkoVasic-NOAA
Update rtgen
8e3bbd7 
Fix error in proj_tmp_theia
@RatkoVasic-NOAA
Merge pull request NCAR#6 from NOAA-EMC/port-2-hera
7fa1fed 
Port 2 hera
@DomHeinzeller
This commit #refs 67538, squashed commit of the following:
8989e81 
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
@RatkoVasic-NOAA
Merge pull request NCAR#7 from climbfuji/emc_reference_update_from_gm…
33b414a 
…tb_develop_20190909

This commit #refs 67538 (merge gmtb/develop into NOAA-EMC/develop)
@RatkoVasic-NOAA
Update NCEPLIBS-pyprodutil (Slurm related)
cabd6a5
@RatkoVasic-NOAA
Merge pull request NCAR#1 from DeniseWorthen/bugfix/mean_salt_rate
c8e05a8 
Weights mean_salt_rate by icewgt
@RatkoVasic-NOAA
Merge pull request NCAR#2 from DeniseWorthen/feature/separate_fluxes
e05bf2a 
separate FW and heat fluxes
@DomHeinzeller
Merge branch 'develop' of https://github.com/noaa-emc/nems into HEAD
df6c5ca
@climbfuji
Copy link
Collaborator Author

Associated PRs:

https://github.com/NCAR/FV3/pull/207
#10
https://github.com/NCAR/NEMSfv3gfs/pull/251
NCAR/ccpp-framework#225
NCAR/ccpp-physics#322
NCAR/GFDL_atmos_cubed_sphere#2
NOAA-PSL/stochastic_physics#2

This was referenced Sep 22, 2019
Merged
Merged
Merged
Merged
@climbfuji climbfuji marked this pull request as ready for review September 22, 2019 14:04
llpcarson
llpcarson approved these changes Sep 23, 2019
View reviewed changes
Copy link

@llpcarson llpcarson left a comment

Choose a reason for hiding this comment

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

Approved - I'll update the FAQs to remove the note about the gerrit/pyprodutil!

@climbfuji climbfuji merged commit 0acf49a into NCAR:gmtb/develop Sep 23, 2019
climbfuji added a commit to climbfuji/NEMS that referenced this pull request Sep 24, 2019
@climbfuji @DomHeinzeller
Merge pull request NCAR#10 from climbfuji/gmtb_develop_update_from_ma…
6293136 
…ster_20190920

gmtb/develop: update from master 2019/09/20
climbfuji pushed a commit to climbfuji/NEMS that referenced this pull request Oct 11, 2019
@RatkoVasic-NOAA
Remove Theia (NCAR#10)
ba1ddf7 
* Nightly tests on Hera

* Remove FV3-MOM6-CICE5 tests from Theia (added on Hera)

* Replace hera with hera.intel

* Remove Theia and correct Hera directories.
climbfuji pushed a commit to climbfuji/NEMS that referenced this pull request Oct 13, 2019
@RatkoVasic-NOAA @climbfuji
Remove Theia (NCAR#10)
823944b 
* Nightly tests on Hera

* Remove FV3-MOM6-CICE5 tests from Theia (added on Hera)

* Replace hera with hera.intel

* Remove Theia and correct Hera directories.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@llpcarson llpcarson llpcarson approved these changes

@grantfirl grantfirl Awaiting requested review from grantfirl

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@climbfuji @llpcarson @DeniseWorthen @theurich @rmontuoro @RatkoVasic-NOAA @DomHeinzeller