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

Use upp as a submodule #904

Closed
wants to merge 7 commits into from
Closed

Use upp as a submodule #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8553d9e
Update FV3
DusanJovic-NOAA Nov 5, 2021
eaac7d2
Use upp as a submodule
DusanJovic-NOAA Nov 5, 2021
095bfc7
Merge remote-tracking branch 'origin/develop' into upp_submodule
DusanJovic-NOAA Nov 9, 2021
8158766
Do not load upp module on wcoss_cray
DusanJovic-NOAA Nov 9, 2021
33cac39
Update FV3
DusanJovic-NOAA Nov 10, 2021
f631647
Merge remote-tracking branch 'origin/develop' into upp_submodule
DusanJovic-NOAA Nov 16, 2021
45be92f
Merge remote-tracking branch 'origin/develop' into upp_submodule
DusanJovic-NOAA Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 3 files
+4 −0 .gitmodules
+2 −0 CMakeLists.txt
+1 −0 upp
1 change: 0 additions & 1 deletion modulefiles/ufs_common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion modulefiles/ufs_common_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions modulefiles/ufs_wcoss_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions modulefiles/ufs_wcoss_cray_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down