From 8553d9e1faa9e7d782f82df118ae7b78b5285e60 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Fri, 5 Nov 2021 13:48:50 +0000 Subject: [PATCH 1/4] Update FV3 --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8b5b737335..76ce6f862c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm - branch = develop + url = https://github.com/DusanJovic-NOAA/fv3atm + branch = upp_submodule [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS From eaac7d2bd63ed910ce0649b1e4df7735977623d0 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Fri, 5 Nov 2021 16:44:18 +0000 Subject: [PATCH 2/4] Use upp as a submodule --- CMakeLists.txt | 3 --- FV3 | 2 +- modulefiles/ufs_common | 1 - modulefiles/ufs_common_debug | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index acea94d4f6..35d79b050d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,9 +127,6 @@ endif() find_package(bacio REQUIRED) find_package(sp REQUIRED) find_package(w3nco REQUIRED) -if(INLINE_POST) - find_package(upp REQUIRED) -endif() # Configure Python find_package(Python 3 REQUIRED COMPONENTS Interpreter) diff --git a/FV3 b/FV3 index c8140b21c4..671392d2f8 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit c8140b21c4a7e6d294d8ac3183a6012e6c44dbb2 +Subproject commit 671392d2f83fd60ee7cc11e9cddd4f9699dbc832 diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common index 0b66d6ed33..fd8b4f655e 100644 --- a/modulefiles/ufs_common +++ b/modulefiles/ufs_common @@ -17,7 +17,6 @@ module load g2tmpl/1.10.0 module load ip/3.3.3 module load sp/2.3.3 module load w3nco/2.4.1 -module load upp/10.0.10 module load gftl-shared/v1.3.3 module load yafyaml/v0.5.1 diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug index 3de5bf6ae0..c9a37b491d 100644 --- a/modulefiles/ufs_common_debug +++ b/modulefiles/ufs_common_debug @@ -17,7 +17,6 @@ module load g2tmpl/1.10.0 module load ip/3.3.3 module load sp/2.3.3 module load w3nco/2.4.1 -module load upp/10.0.10 module load gftl-shared/v1.3.3 module load yafyaml/v0.5.1 From 81587661b8d08fdf9a7735a69dfb0c7f6495a37e Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Tue, 9 Nov 2021 19:50:52 +0000 Subject: [PATCH 3/4] Do not load upp module on wcoss_cray --- modulefiles/ufs_wcoss_cray | 6 ------ modulefiles/ufs_wcoss_cray_debug | 6 ------ 2 files changed, 12 deletions(-) diff --git a/modulefiles/ufs_wcoss_cray b/modulefiles/ufs_wcoss_cray index e8970fc42b..f8bac24efa 100644 --- a/modulefiles/ufs_wcoss_cray +++ b/modulefiles/ufs_wcoss_cray @@ -49,12 +49,6 @@ module load sp/2.3.3 module load w3emc/2.7.3 module load w3nco/2.4.1 -module load gfsio/1.4.1 -module load sfcio/1.4.1 -module load sigio/2.3.2 - -module load upp/10.0.10 - ## WCOSS Cray execution prereqs: module load rca module load alps diff --git a/modulefiles/ufs_wcoss_cray_debug b/modulefiles/ufs_wcoss_cray_debug index aabcf37682..1589d500f5 100644 --- a/modulefiles/ufs_wcoss_cray_debug +++ b/modulefiles/ufs_wcoss_cray_debug @@ -49,12 +49,6 @@ module load sp/2.3.3 module load w3emc/2.7.3 module load w3nco/2.4.1 -module load gfsio/1.4.1 -module load sfcio/1.4.1 -module load sigio/2.3.2 - -module load upp/10.0.10 - ## WCOSS Cray execution prereqs: module load rca module load alps From 33cac397ba9a08b60189f6b9b7f088c3ecfba5c6 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Wed, 10 Nov 2021 17:55:21 +0000 Subject: [PATCH 4/4] Update FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index a62a0757af..bf4e083908 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit a62a0757afe2b9540e5cf2a96ebba5116bb45858 +Subproject commit bf4e0839083edfc58a201220c10fbb19556f56b6