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

Updates to make GEOSldas infrastructure similar to GEOSgcm #501

Merged
merged 2 commits into from
Dec 22, 2021
Merged

Updates to make GEOSldas infrastructure similar to GEOSgcm #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f586190
Updates to make GEOSldas infrstructure similar to GEOSgcm
mathomp4 Dec 21, 2021
e206ccd
Merge branch 'develop' into feature/mathomp4/consistent-infrastructure
mathomp4 Dec 21, 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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ executors:

ifort-large:
docker:
- image: gmao/ubuntu20-geos-env:v6.2.8-intelmpi_2021.2.0-intel_2021.2.0
- image: gmao/ubuntu20-geos-env:v6.2.8-intelmpi_2021.3.0-intel_2021.3.0
auth:
username: $DOCKERHUB_USER
password: $DOCKERHUB_AUTH_TOKEN
Expand Down
13 changes: 10 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ set (DOING_GEOS5 YES)
# Should find a better place for this - used in Chem component
set (ACG_FLAGS -v)

list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/@cmake")
# mepo can now clone subrepos in three styles
foreach (dir cmake @cmake cmake@)
if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${dir})
list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/${dir}")
set (ESMA_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/${dir}" CACHE PATH "Path to ESMA_cmake code")
endif ()
endforeach ()
include (esma)

ecbuild_declare_project()
Expand All @@ -37,8 +43,9 @@ add_definitions(-Dsys${CMAKE_SYSTEM_NAME} -DESMA64)
add_definitions(${MPI_Fortran_COMPILE_FLAGS})
include_directories(${MPI_Fortran_INCLUDE_PATH})

esma_mepo_style(env env_dir)
esma_add_subdirectory (${env_dir})
# Recursively build source tree
add_subdirectory (@env)
add_subdirectory (src)

# https://www.scivision.dev/cmake-auto-gitignore-build-dir/
Expand All @@ -53,5 +60,5 @@ install(
DESTINATION ${CMAKE_INSTALL_PREFIX}
)

# Adds abiilty to tar source
# Adds ability to tar source
include (esma_cpack)
4 changes: 4 additions & 0 deletions parallel_build.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,9 @@ set argv = "$origargv"

if ( -d ${ESMADIR}/@env ) then
${ESMADIR}/@env/build.csh -esmadir $ESMADIR $argv
else if ( -d ${ESMADIR}/env@ ) then
${ESMADIR}/env@/build.csh -esmadir $ESMADIR $argv
else if ( -d ${ESMADIR}/env ) then
${ESMADIR}/env/build.csh -esmadir $ESMADIR $argv
endif

2 changes: 1 addition & 1 deletion src/Components/GEOSldas_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
esma_set_this ()

esma_add_subdirectories (@GEOSgcm_GridComp )
esma_add_subdirectory(GEOSgcm_GridComp )

set (alldirs
GEOSmetforce_GridComp
Expand Down
4 changes: 2 additions & 2 deletions src/Shared/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
add_subdirectory (@MAPL)
add_subdirectory (@GMAO_Shared)
esma_add_subdirectory (MAPL)
esma_add_subdirectory (GMAO_Shared)