From 671392d2f83fd60ee7cc11e9cddd4f9699dbc832 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Fri, 5 Nov 2021 16:42:56 +0000 Subject: [PATCH 1/2] Use upp as a submodule --- .gitmodules | 3 +++ CMakeLists.txt | 2 ++ upp | 1 + 3 files changed, 6 insertions(+) create mode 160000 upp diff --git a/.gitmodules b/.gitmodules index a54f243ae..cdc7652e5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ path = ccpp/physics url = https://github.com/NCAR/ccpp-physics branch = main +[submodule "upp"] + path = upp + url = https://github.com/DusanJovic-NOAA/UPP diff --git a/CMakeLists.txt b/CMakeLists.txt index 03ec1411a..ec9721ba6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,8 @@ add_subdirectory(atmos_cubed_sphere) ### fv3atm ############################################################################### if(INLINE_POST) + set(BUILD_POSTEXEC OFF) + add_subdirectory(upp) set(POST_SRC io/inline_post.F90 io/post_nems_routines.F90 io/post_gfs.F90 io/post_regional.F90) else() set(POST_SRC io/inline_post_stub.F90) diff --git a/upp b/upp new file mode 160000 index 000000000..0575888b9 --- /dev/null +++ b/upp @@ -0,0 +1 @@ +Subproject commit 0575888b9f6fbd7fc4450d0be46810863bb32a11 From bf4e0839083edfc58a201220c10fbb19556f56b6 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Wed, 10 Nov 2021 17:53:29 +0000 Subject: [PATCH 2/2] Update upp --- .gitmodules | 3 ++- upp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index cdc7652e5..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,4 +12,5 @@ branch = main [submodule "upp"] path = upp - url = https://github.com/DusanJovic-NOAA/UPP + url = https://github.com/NOAA-EMC/UPP + branch = develop diff --git a/upp b/upp index 0575888b9..c939eae6b 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 0575888b9f6fbd7fc4450d0be46810863bb32a11 +Subproject commit c939eae6bacb3c2a93753bba54b8646f32a0a7ab