Skip to content

Commit

Permalink
Merge branch 'oksanaguba/homme/remove-folders' into next (PR #3070)
Browse files Browse the repository at this point in the history
Removes theta, pese, and vertical_se folders and theta, pese execs.

[bfb]
  • Loading branch information
oksanaguba committed Aug 15, 2019
2 parents 6857e5e + 0e06117 commit a76a145
Show file tree
Hide file tree
Showing 259 changed files with 6 additions and 23,198 deletions.
6 changes: 0 additions & 6 deletions components/homme/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ OPTION(BUILD_HOMME_PREQX "Primitive equations FEM" ON)
OPTION(BUILD_HOMME_THETA "SB81 NH model with theta and Exner pressure" ON)
OPTION(BUILD_HOMME_PREQX_ACC "Primitive equations FEM with OpenACC" ON)
OPTION(BUILD_HOMME_PREQX_KOKKOS "Primitive equations FEM with Kokkos" OFF)
OPTION(BUILD_HOMME_PESE "Primitive equations with vertical spectral elements" OFF)
OPTION(BUILD_HOMME_SWIM "Shallow water equations implicit" OFF)
OPTION(BUILD_HOMME_PRIM "Primitive equations implicit" OFF)
OPTION(HOMME_ENABLE_COMPOSE "Build COMPOSE semi-Lagrangian tracer transport code" ON)
Expand Down Expand Up @@ -380,7 +379,6 @@ IF(${BUILD_HOMME_PREQX})
ENDIF()

IF(${BUILD_HOMME_THETA})
ADD_SUBDIRECTORY(src/theta)
ADD_SUBDIRECTORY(src/theta-l)
ENDIF()

Expand All @@ -392,10 +390,6 @@ IF(${BUILD_HOMME_PREQX_KOKKOS})
ADD_SUBDIRECTORY(src/preqx_kokkos)
ENDIF()

IF(${BUILD_HOMME_PESE})
ADD_SUBDIRECTORY(src/pese)
ENDIF()

IF(${BUILD_HOMME_SWIM})
ADD_SUBDIRECTORY(src/swim)
ENDIF()
Expand Down
3 changes: 0 additions & 3 deletions components/homme/README
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ src/preqx original hydrostatic primitive equation model
src/preqx_acc preqx with openACC acceleration
src/prim Fully implicit version of preqx
src/theta-l nonhydrostatic model with SB81 vertical discretization
src/theta nonhydrostatic model with collocated vertical (not maintained)
src/pese primitive equation model with veritcal SE discretization (not maintained)

For instructions on building and configuring, see README.cmake

Expand Down Expand Up @@ -90,7 +88,6 @@ These are base classes only so src/preqx_acc can provide openACC versions
src/share/viscosity_base.F90 biharmonic and other global derivatives

src/share/prim_driver_base.F90 All SB81 models use this unchanged
src/pese model replaces this to support vertical SE

src/share/prim_advection_base.F90 Eulerian 3D advection code
src/preqx_acc has openACC version
Expand Down
2 changes: 1 addition & 1 deletion components/homme/README.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
10/2016 DMH

The CMAKE build system supports a number of user-configurable targets:
sweqx, preqx, preqx_acc, pese, swim, prim
sweqx, preqx, preqx_acc, theta-l, swim, prim

Scripts which will CMake configure, build, construct namelists and run a simulation using these
targets, see:
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Empty file.

This file was deleted.

This file was deleted.

Loading

0 comments on commit a76a145

Please sign in to comment.