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.

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

Decompose OGS_CONFIG #18

Merged
merged 2 commits into from
Mar 11, 2016
Merged

Decompose OGS_CONFIG #18

merged 2 commits into from
Mar 11, 2016

Conversation

norihiro-w
Copy link
Contributor

(Merging of this PR should be waited until #26 and #28 are done.)

Current OGS_CONFIG CMake option supports the following configurations.

  • FEM
  • SP
  • GEMS
  • JFNK
  • PETSC
  • PETSC_GEMS
  • IPQC
  • PQC
  • BRNS
  • LIS
  • CAP
  • MKL
  • MPI

These are actually mixtures of geochemical solver and linear solver types, and the mixture results in a lengthy list of configurations if we want to have different combinations of them, e.g. GEMS and PETSC_GEMS.

To simplify this, this PR introduces OGS_LSOLVER and OGS_CHEMSOLVER options. OGS_LSOLVER option supports

  • DEFAULT (default setting in a configuration set, see below)
  • RF (solver form Rockflow time)
  • SP
  • PETSC

Additionally OGS_USE_LIS and OGS_USE_MKL are introduced to use either Lis or MKL or both ( SP should be selected in OGS_LSOLVER because data structures in SP are internally used).

OGS_CHEMSOLVER options supports

  • DEFAULT (default setting in a configuration set, see below)
  • NONE
  • GEMS
  • IPQC
  • PQC
  • BRNS
  • CAP

After these changes, OGS_CONFIG is used to specify a configuration set. Followings are supported currently:

  • FEM: RF + NONE
  • SP: SP + NONE
  • GEMS: SP + GEMS
  • JFNK: SP + JFNK
  • PETSC: PETSC
  • IPQC: RF + IPQC
  • PQC: SP + PQC
  • BRNS: SP + BRNS
  • CAP: RF + CAP
  • LIS: SP + LIS
  • MKL: SP + LIS + MKL
  • MPI: SP(MPI)
  • PETSC: PETSC(MPI)

@norihiro-w norihiro-w added the WIP label Mar 4, 2016
@norihiro-w norihiro-w changed the title split linear solver type from OGS_CONFIG Decompose OGS_CONFIG Mar 4, 2016
@bilke
Copy link
Member

bilke commented Mar 7, 2016

Good work (from CMake perspective)! 👍

@wenqing
Copy link
Member

wenqing commented Mar 10, 2016

👍

@norihiro-w norihiro-w force-pushed the cmake-solver branch 2 times, most recently from 4b3b8f4 to 3e44683 Compare March 11, 2016 05:55
norihiro-w added a commit that referenced this pull request Mar 11, 2016
@norihiro-w norihiro-w merged commit 9255da9 into ufz:master Mar 11, 2016
@norihiro-w norihiro-w deleted the cmake-solver branch March 11, 2016 13:45
@nbeyond
Copy link

nbeyond commented May 24, 2017

Love it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants