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

cleanup: remove DG and SPELT code #957

Merged
merged 3 commits into from
Aug 1, 2016
Merged

cleanup: remove DG and SPELT code #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
788bbdd
cleanup: removed Discontinuous Galerkin (DG) code
david-m-hall Jul 19, 2016
2d56e18
cleanup: removed vast majority of SPELT code from HOMME
david-m-hall Jul 20, 2016
d3b0886
Merge branch 'halldm2000/homme/remove_spelt' into halldm2000/homme/re…
david-m-hall Jul 20, 2016
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
18 changes: 0 additions & 18 deletions components/homme/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,11 @@ ENDIF ()
OPTION(BUILD_HOMME_SWEQX "Shallow water equations FEM" ON)
OPTION(BUILD_HOMME_PREQX "Primitive equations FEM" ON)
OPTION(BUILD_HOMME_PREQX_ACC "Primitive equations FEM with OpenACC" ON)
OPTION(BUILD_HOMME_SWDGX "Shallow water equations DG" OFF)
OPTION(BUILD_HOMME_PRIMDGX "Primitive equations DG" OFF)
OPTION(BUILD_HOMME_SWIM "Shallow water equations implicit" OFF)
OPTION(BUILD_HOMME_PRIM "Primitive equations implicit" OFF)

# Primitive equations FEM with separate tracer routines
OPTION(BUILD_PREQX_SPELT "Primitive euqations with SPELT tracers" OFF)

# Cristoph's "standalone" executables
OPTION(BUILD_HOMME_FVM "Standalone FVM tracers" OFF)
OPTION(BUILD_HOMME_SPELT "Standalone SPELT tracers" OFF)

# swim and prim executables require C++ compiler
IF(${BUILD_HOMME_SWIM} OR ${BUILD_HOMME_PRIM})
Expand Down Expand Up @@ -186,22 +180,10 @@ IF(${BUILD_HOMME_PREQX_ACC})
ADD_SUBDIRECTORY(src/preqx_acc)
ENDIF()

IF(${BUILD_HOMME_SWDGX})
ADD_SUBDIRECTORY(src/swdgx)
ENDIF()

IF(${BUILD_HOMME_PRIMDGX})
ADD_SUBDIRECTORY(src/primdgx)
ENDIF()

IF(${BUILD_HOMME_FVM})
ADD_SUBDIRECTORY(src/fvm)
ENDIF()

IF(${BUILD_HOMME_SPELT})
ADD_SUBDIRECTORY(src/spelt)
ENDIF()

IF(${BUILD_HOMME_SWIM})
ADD_SUBDIRECTORY(src/swim)
ENDIF()
Expand Down
2 changes: 0 additions & 2 deletions components/homme/compile_scripts/chester/compile.cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ cmake \
-DHDF5_DIR=$HDF5_DIR \
-DPREQX_NP=4 \
-DPREQX_PLEV=$NLEVELS \
-DBUILD_HOMME_SWDGX=FALSE \
-DBUILD_HOMME_SWEQX=FALSE \
-DBUILD_HOMME_PRIMDGX=FALSE \
-DENABLE_OPENMP=TRUE \
-DHOMME_PROJID=STF006 \
-DENABLE_OPENACC=FALSE \
Expand Down
2 changes: 0 additions & 2 deletions components/homme/compile_scripts/chester/compile.openacc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ cmake \
-DHDF5_DIR=$HDF5_DIR \
-DPREQX_NP=4 \
-DPREQX_PLEV=$NLEVELS \
-DBUILD_HOMME_SWDGX=FALSE \
-DBUILD_HOMME_SWEQX=FALSE \
-DBUILD_HOMME_PRIMDGX=FALSE \
-DENABLE_OPENMP=TRUE \
-DHOMME_PROJID=STF006 \
-DENABLE_OPENACC=TRUE \
Expand Down
2 changes: 0 additions & 2 deletions components/homme/compile_scripts/thatchroof/compile.cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ cmake \
-DHDF5_DIR=$HDF5_DIR \
-DPREQX_NP=4 \
-DPREQX_PLEV=$NLEVELS \
-DBUILD_HOMME_SWDGX=FALSE \
-DBUILD_HOMME_SWEQX=FALSE \
-DBUILD_HOMME_PRIMDGX=FALSE \
-DENABLE_OPENMP=TRUE \
-DHOMME_PROJID=STF006 \
-DENABLE_OPENACC=FALSE \
Expand Down
2 changes: 0 additions & 2 deletions components/homme/compile_scripts/thatchroof/compile.openacc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ cmake \
-DHDF5_DIR=$HDF5_DIR \
-DPREQX_NP=4 \
-DPREQX_PLEV=$NLEVELS \
-DBUILD_HOMME_SWDGX=FALSE \
-DBUILD_HOMME_SWEQX=FALSE \
-DBUILD_HOMME_PRIMDGX=FALSE \
-DBUILD_HOMME_PREQX=FALSE \
-DBUILD_HOMME_PREQX_ACC=TRUE \
-DENABLE_OPENMP=TRUE \
Expand Down
2 changes: 0 additions & 2 deletions components/homme/compile_scripts/titan/compile.openacc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ cmake
-DPREQX_NP=4 \
-DPREQX_QSIZE_D=$NTRACERS \
-DPREQX_PLEV=$NLEVELS \
-DBUILD_HOMME_SWDGX=FALSE \
-DBUILD_HOMME_SWEQX=FALSE \
-DBUILD_HOMME_PRIMDGX=FALSE \
-DBUILD_HOMME_PREQX_ACC=TRUE \
-DBUILD_HOMME_PREQX=FALSE \
-DENABLE_OPENMP=TRUE \
Expand Down
2 changes: 0 additions & 2 deletions components/homme/compile_scripts/titan/compile.openacc.oncpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ cmake \
-DPREQX_NP=4 \
-DPREQX_QSIZE_D=$NTRACERS \
-DPREQX_PLEV=$NLEVELS \
-DBUILD_HOMME_SWDGX=FALSE \
-DBUILD_HOMME_SWEQX=FALSE \
-DBUILD_HOMME_PRIMDGX=FALSE \
-DBUILD_HOMME_PREQX_ACC=TRUE \
-DBUILD_HOMME_PREQX=FALSE \
-DENABLE_OPENMP=TRUE \
Expand Down
2 changes: 0 additions & 2 deletions components/homme/compile_scripts/titan/compile.sweqx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ cmake \
-DHDF5_DIR=$HDF5_DIR \
-DSWEQX_NP=4 \
-DSWEQX_PLEV=$NLEVELS \
-DBUILD_HOMME_SWDGX=FALSE \
-DBUILD_HOMME_SWEQX=TRUE \
-DBUILD_HOMME_PRIMDGX=FALSE \
-DBUILD_HOMME_PREQX=FALSE \
-DENABLE_OPENMP=TRUE \
-DHOMME_PROJID=STF006 \
Expand Down
Loading