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

Jump to bottom

Add support for cmake build system. #11

Merged
merged 17 commits into from
Dec 5, 2019
Merged

Add support for cmake build system. #11

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2464455
Add CMakeLists.txt
DusanJovic-NOAA Oct 15, 2019
575c1d0
Merge branch 'develop' into cmake_rt
DusanJovic-NOAA Nov 4, 2019
186cf76
update after merge with develop (move ccpp under FV3)
DusanJovic-NOAA Nov 4, 2019
cf8e622
update ccpp prebuild step for out-of-source build. run all compiles c…
DusanJovic-NOAA Nov 5, 2019
0e7ff41
add INLINE_POST cmake option
DusanJovic-NOAA Nov 7, 2019
ea43231
update FV3 submodule
DusanJovic-NOAA Nov 8, 2019
b8b2472
update cmake an regtest on jet
DusanJovic-NOAA Nov 8, 2019
ed950b6
Update .gitmodule to point to DusanJovic-NOAA/fv3atm
DusanJovic-NOAA Nov 22, 2019
82412ab
remove cmake/configure_theia.*. set AVX2 to OFF in cmake/configure_li…
DusanJovic-NOAA Nov 23, 2019
575a188
Update CMakeLists.txt. Enable WW3 on hera.
DusanJovic-NOAA Nov 24, 2019
7ccd3ea
Add build.sh
DusanJovic-NOAA Nov 24, 2019
39ec12f
Enable inline post on Hera
DusanJovic-NOAA Nov 24, 2019
b174df7
Update build.sh to use BUILD_JOBS environment variable if set. Update…
DusanJovic-NOAA Nov 25, 2019
d018c21
Merge remote-tracking branch 'origin/cmake_rt' into ufs_public_release
DusanJovic-NOAA Nov 25, 2019
e7dcda0
Remove comments about serialized ccpp builds. All build jobs are now …
DusanJovic-NOAA Nov 27, 2019
d62d01a
Updates for compiling on macOS with clang/gfortran or gcc/gfortran (#1)
climbfuji Dec 3, 2019
d909be3
Update .gitmodules and fv3atm submodule pointer
DusanJovic-NOAA Dec 5, 2019
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
Prev Previous commit
Next Next commit
remove cmake/configure_theia.*. set AVX2 to OFF in cmake/configure_li… 
…nux.gnu
  • Loading branch information
@DusanJovic-NOAA
DusanJovic-NOAA committed Nov 23, 2019
commit 82412ab82bde39660e54b22f6d9cbee01dec75a4
1 change: 0 additions & 1 deletion cmake/GNU.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ else()
message("OPENMP is disabled")
endif()


if(AVX2)
DusanJovic-NOAA marked this conversation as resolved.
Show resolved Hide resolved
message("AVX2 is ENABLED")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
Expand Down
8 changes: 4 additions & 4 deletions cmake/Intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ else()
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -xCORE-AVX2 -qno-opt-dynamic-align")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -xCORE-AVX2 -qno-opt-dynamic-align")
else()
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -xHOST -qno-opt-dynamic-align")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -xHOST -qno-opt-dynamic-align")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qno-opt-dynamic-align")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align")
endif()
endif()

Expand Down Expand Up @@ -79,12 +79,12 @@ else()
message("OPENMP is disabled")
endif()


if(AVX2)
message("AVX2 is ENABLED")
else()
message("AVX2 is disabled")
endif()


if(INLINE_POST)
message("INLINE_POST is ENABLED")
else()
Expand Down
5 changes: 3 additions & 2 deletions cmake/configure_linux.gnu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ option(REPRO "Enable REPRO mode" OFF)
option(VERBOSE "Enable VERBOSE mode" OFF)
option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)
option(AVX2 "Enable AVX2 instruction set" OFF)

option(INLINE_POST "Enable inline post" OFF)

include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake )

set(NEMSIO_INC $ENV{NEMSIO_INC})
set(NCEP_LIBS $ENV{NEMSIO_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd})
set(POST_INC $ENV{POST_INC})
set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB})

set(ESMF_MOD ${ESMF_F90COMPILEPATHS})
set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}")
Expand Down
32 changes: 0 additions & 32 deletions cmake/configure_theia.gnu.cmake
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions cmake/configure_theia.intel.cmake
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions cmake/configure_theia.pgi.cmake
View file
Open in desktop

This file was deleted.