From 0aae4b6ec80cfb784bc87f7d681303c898b5a564 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 27 May 2020 13:54:32 -0600 Subject: [PATCH 1/3] Update .gitmodules and submodule pointer for fv3atm for code review and testing --- .gitmodules | 6 ++++-- FV3 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8a3a77983d..cdc76fbb61 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-GSD/fv3atm - branch = gsd/develop + #url = https://github.com/NOAA-GSD/fv3atm + #branch = gsd/develop + url = https://github.com/climbfuji/fv3atm + branch = gsd_develop_blocked_data_structures [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index c441a8edc2..45337f7871 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit c441a8edc2ac1526f884b3fe344cd6281494b4c7 +Subproject commit 45337f787101509636cd5fc5159b2f68fc7fe3aa From 059912cfef08d3d02e685c9a86ada651656668ae Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 27 May 2020 21:17:16 -0600 Subject: [PATCH 2/3] tests/rt_ccpp_gsd.conf: remove STATIC=Y from compile options, no longer required --- FV3 | 2 +- tests/rt_ccpp_gsd.conf | 78 +++++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/FV3 b/FV3 index 45337f7871..289edfc507 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 45337f787101509636cd5fc5159b2f68fc7fe3aa +Subproject commit 289edfc507af77eef5735ebec66853bcabce868a diff --git a/tests/rt_ccpp_gsd.conf b/tests/rt_ccpp_gsd.conf index bdbbe21118..991314d49a 100644 --- a/tests/rt_ccpp_gsd.conf +++ b/tests/rt_ccpp_gsd.conf @@ -1,51 +1,51 @@ -############################################################################################################################################################################# -# CCPP STATIC tests # -############################################################################################################################################################################# +################################################################################################################################################################################# +# CCPP STATIC tests # +################################################################################################################################################################################# # Compile with CCPP - static mode -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | hera.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.gnu | fv3 | +COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | hera.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.gnu | fv3 | # Run tests -RUN | fv3_ccpp_thompson_mynn | standard | | fv3 | -RUN | fv3_ccpp_gf_thompson | standard | | fv3 | -RUN | fv3_ccpp_gsd | standard | | fv3 | -RUN | fv3_ccpp_gsd_coldstart | standard | | | -RUN | fv3_ccpp_gsd_warmstart | standard | | | fv3_ccpp_gsd_coldstart -RUN | fv3_ccpp_gsd_noah | standard | | fv3 | +RUN | fv3_ccpp_thompson_mynn | standard | | fv3 | +RUN | fv3_ccpp_gf_thompson | standard | | fv3 | +RUN | fv3_ccpp_gsd | standard | | fv3 | +RUN | fv3_ccpp_gsd_coldstart | standard | | | +RUN | fv3_ccpp_gsd_warmstart | standard | | | fv3_ccpp_gsd_coldstart +RUN | fv3_ccpp_gsd_noah | standard | | fv3 | # Compile with CCPP - static mode -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | hera.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | cheyenne.gnu | fv3 | +COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | hera.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | cheyenne.gnu | fv3 | # Run tests -RUN | fv3_ccpp_gsd_mynnsfc | standard | | fv3 | -RUN | fv3_ccpp_gsd_noah_mynnsfc | standard | | fv3 | +RUN | fv3_ccpp_gsd_mynnsfc | standard | | fv3 | +RUN | fv3_ccpp_gsd_noah_mynnsfc | standard | | fv3 | # Compile with CCPP - static mode -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR,FV3_RAPHRRR | standard | hera.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.gnu | fv3 | +COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR,FV3_RAPHRRR | standard | hera.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.gnu | fv3 | # Run tests -RUN | fv3_ccpp_thompson | standard | | fv3 | +RUN | fv3_ccpp_thompson | standard | | fv3 | # Non-aerosol field_table staged only on hera for the moment -RUN | fv3_ccpp_thompson_no_aero | standard | hera.intel | fv3 | -RUN | fv3_ccpp_gf | standard | | fv3 | -RUN | fv3_ccpp_mynn | standard | | fv3 | -RUN | fv3_ccpp_gsd_drag_suite | standard | | fv3 | -RUN | fv3_ccpp_gsd_sar | standard | | fv3 | -RUN | fv3_ccpp_raphrrr | standard | | fv3 | +RUN | fv3_ccpp_thompson_no_aero | standard | hera.intel | fv3 | +RUN | fv3_ccpp_gf | standard | | fv3 | +RUN | fv3_ccpp_mynn | standard | | fv3 | +RUN | fv3_ccpp_gsd_drag_suite | standard | | fv3 | +RUN | fv3_ccpp_gsd_sar | standard | | fv3 | +RUN | fv3_ccpp_raphrrr | standard | | fv3 | # Compile with CCPP - static mode, debug -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | hera.intel | fv3 | -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 | +COMPILE | CCPP=Y DEBUG=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | hera.intel | fv3 | +COMPILE | CCPP=Y DEBUG=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y DEBUG=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 | # Run tests -RUN | fv3_ccpp_gsd_debug | standard | | fv3 | -RUN | fv3_ccpp_gsd_diag3d_debug | standard | | fv3 | -RUN | fv3_ccpp_gsd_mynnsfc_debug | standard | | fv3 | -RUN | fv3_ccpp_gsd_noah_mynnsfc_debug | standard | | fv3 | +RUN | fv3_ccpp_gsd_debug | standard | | fv3 | +RUN | fv3_ccpp_gsd_diag3d_debug | standard | | fv3 | +RUN | fv3_ccpp_gsd_mynnsfc_debug | standard | | fv3 | +RUN | fv3_ccpp_gsd_noah_mynnsfc_debug | standard | | fv3 | # Non-aerosol field_table staged only on hera for the moment -RUN | fv3_ccpp_thompson_no_aero_debug | standard | hera.intel | fv3 | +RUN | fv3_ccpp_thompson_no_aero_debug | standard | hera.intel | fv3 | # Compile with CCPP - static mode, debug, 32bit dynamics -COMPILE | 32BIT=Y CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_SAR,FV3_RAPHRRR | standard | hera.intel | fv3 | -COMPILE | 32BIT=Y CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.intel | fv3 | -COMPILE | 32BIT=Y CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.gnu | fv3 | +COMPILE | 32BIT=Y CCPP=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAPHRRR | standard | hera.intel | fv3 | +COMPILE | 32BIT=Y CCPP=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.intel | fv3 | +COMPILE | 32BIT=Y CCPP=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.gnu | fv3 | # Run tests -RUN | fv3_ccpp_gsd_sar_25km_debug | standard | | fv3 | +RUN | fv3_ccpp_gsd_sar_25km_debug | standard | | fv3 | From 72cd56a83e5051c30a9945c378e5f83366e6781b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 1 Jun 2020 15:38:15 -0600 Subject: [PATCH 3/3] Revert change to .gitmodules and update submodule pointer for fv3atm --- .gitmodules | 6 ++---- FV3 | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index cdc76fbb61..8a3a77983d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "FV3"] path = FV3 - #url = https://github.com/NOAA-GSD/fv3atm - #branch = gsd/develop - url = https://github.com/climbfuji/fv3atm - branch = gsd_develop_blocked_data_structures + url = https://github.com/NOAA-GSD/fv3atm + branch = gsd/develop [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 289edfc507..2a5c1b8282 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 289edfc507af77eef5735ebec66853bcabce868a +Subproject commit 2a5c1b82828781233faf55331adba6d288deab6e