Skip to content

Commit

Permalink
Fix a few issue related to commit 603cad3 (Issue #761)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mperego
mperego committed Nov 15, 2021
1 parent 24724b8 commit dc72444
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 84 deletions.
20 changes: 16 additions & 4 deletions tests/small/LandIce/FO_AIS/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
get_filename_component(testNameRoot ${CMAKE_CURRENT_SOURCE_DIR}_16km NAME)

# This variable will be set in the input files during the 'configure_file' call
if (ALBANY_IOPX)
set (USE_SERIAL_MESH "true")
else ()
# If there's no Iopx, we *must* have ALBANY_DECOMP defined (to decompose the mesh)
# OR execute with only one rank.
IF (ALBANY_MPI AND NOT ${ALBANY_SEACAS_PATH})
MESSAGE (FATAL_ERROR "Error! Cannot execute FO_AIS tests in parallel without Iopx or decomp from Trilinos.\n")
ENDIF()
set (USE_SERIAL_MESH "false")
endif()

# Copy mesh and input files from source dir to binary dir
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/antarctica_2d.exo
${CMAKE_CURRENT_BINARY_DIR}/antarctica_2d.exo COPYONLY)
Expand All @@ -25,7 +37,7 @@ endif()

if (ALBANY_EPETRA)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/inputML.yaml
${CMAKE_CURRENT_BINARY_DIR}/inputML.yaml COPYONLY)
${CMAKE_CURRENT_BINARY_DIR}/inputML.yaml)
add_test(${testNameRoot}_ML ${Albany8.exe} inputML.yaml)

if (NOT ALBANY_IOPX AND ALBANY_MPI)
Expand All @@ -40,11 +52,11 @@ endif()

if(ALBANY_MUELU)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/inputMueLuShort.yaml
${CMAKE_CURRENT_BINARY_DIR}/inputMueLuShort.yaml COPYONLY)
${CMAKE_CURRENT_BINARY_DIR}/inputMueLuShort.yaml)
add_test(${testNameRoot}_MueLuShortList ${Albany8.exe} inputMueLuShort.yaml)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/inputMueLu.yaml
${CMAKE_CURRENT_BINARY_DIR}/inputMueLu.yaml COPYONLY)
${CMAKE_CURRENT_BINARY_DIR}/inputMueLu.yaml)
add_test(${testNameRoot}_MueLu ${Albany8.exe} inputMueLu.yaml)

if (NOT ALBANY_IOPX AND ALBANY_MPI)
Expand All @@ -65,7 +77,7 @@ endif()

# if (ALBANY_FROSCH)
# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/input_FROSch.yaml
# ${CMAKE_CURRENT_BINARY_DIR}/input_FROSch.yaml COPYONLY)
# ${CMAKE_CURRENT_BINARY_DIR}/input_FROSch.yaml)
# add_test(${testNameRoot}_FROSch ${Albany8.exe} input_FROSch.yaml)
# if (NOT ALBANY_IOPX AND ALBANY_MPI)
# set_tests_properties(${testNameRoot}_FROSch
Expand Down
2 changes: 1 addition & 1 deletion tests/small/LandIce/FO_AIS/inputML.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ ANONYMOUS:
basalside:
Method: Ioss
Number Of Time Derivatives: 0
Use Serial Mesh: true
Use Serial Mesh: ${USE_SERIAL_MESH}
Exodus Input File Name: antarctica_2d.exo
Cubature Degree: 3
Required Fields Info:
Expand Down
40 changes: 1 addition & 39 deletions tests/small/LandIce/FO_AIS/inputMueLu.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ ANONYMOUS:
basalside:
Method: Ioss
Number Of Time Derivatives: 0
Use Serial Mesh: true
Use Serial Mesh: ${USE_SERIAL_MESH}
Exodus Input File Name: antarctica_2d.exo
Cubature Degree: 3
Required Fields Info:
Expand Down Expand Up @@ -337,44 +337,6 @@ ANONYMOUS:
A: myRebalanceAFact
Coordinates: myRebalanceProlongatorFact
Importer: myRepartitionFact
FROSch:
FROSch Preconditioner Type: TwoLevelPreconditioner # FROSch preconditioner type. Options: OneLevelPreconditioner, TwoLevelPreconditioner
OverlappingOperator Type: AlgebraicOverlappingOperator # First Level: AlgebrAlgebraicOverlappingOperator determines the overlap based on the graph of the matrix
CoarseOperator Type: IPOUHarmonicCoarseOperator # Second Level: IPOUHarmonicCoarseOperator work for all kinds of GDSW type coarse spaces
Recycling: true # This enables the possibility to re-use parts of the preconditioner in a Newton or time iteration
Dimension: 3 # Spatial dimension of the problem
DofsPerNode: 2 # Number of degrees of freedom per node
Overlap: 0 # Number of layers of elements in the overlap
Null Space Type: Input # Null space is provided by Albany
AlgebraicOverlappingOperator:
'Reuse: Symbolic Factorization': true # Reuse of the symbolic factorization
Adding Layers Strategy: CrsGraph
Solver: # Solver on the first level
SolverType: Amesos2 # Solver package: Amesos2 or Ifpack2
Solver: Klu # Solver name (depends on the solver package): Klu, RILUK, ...
IPOUHarmonicCoarseOperator:
'Reuse: Coarse Basis': true # Reuse of the coarse basis functions
'Reuse: Coarse Matrix': false # Reuse of the coarse matrix
'Reuse: Coarse Matrix Symbolic Factorization': true # Reuse of the symbolic factorization of the coarse matrix
Blocks:
1: # For a multiphysics problem, the coarse space may be decomposed into several blocks. Here, we only need one block.
InterfacePartitionOfUnity: # The interface partition of unity defines the specific GDSW type coarse space
Type: RGDSW # Possible types: GDSW, RGDSW
GDSW:
Type: Full # Here, we could select subspaces of the GDSW coarse. Generally, we use "Full".
RGDSW:
Type: Full # Here, we could select subspaces of the RGDSW coarse. Generally, we use "Full".
Distance Function: Inverse Euclidean # Options 1 and 2.2 differ in the distance function used to compute the interface values: "Constant" (Option 1) and "Inverse Euclidean" (Option 2.2)
Interface Communication Strategy: CreateOneToOneMap
ExtensionSolver: # Solver for the energy-minimizing extensions
SolverType: Amesos2 # Solver package: Amesos2 or Ifpack2
Solver: Klu # Solver name (depends on the solver package): Klu, RILUK, ...
Distribution: # Parallel distribution of the coarse problem
Type: linear # Specifies the parallel distribution strategy. For now, we use "linear"
NumProcs: 1 # Number of ranks used for the coarse problem
CoarseSolver: # Solver for the coarse problem
SolverType: Amesos2 # Solver package: Amesos2 or Ifpack2
Solver: Klu # Solver name (depends on the solver package): Klu, RILUK, ...
ML:
Base Method Defaults: none
ML Settings:
Expand Down
2 changes: 1 addition & 1 deletion tests/small/LandIce/FO_AIS/inputMueLuShort.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ ANONYMOUS:
basalside:
Method: Ioss
Number Of Time Derivatives: 0
Use Serial Mesh: true
Use Serial Mesh: ${USE_SERIAL_MESH}
Exodus Input File Name: antarctica_2d.exo
Cubature Degree: 3
Required Fields Info:
Expand Down
2 changes: 1 addition & 1 deletion tests/small/LandIce/FO_AIS/input_FROSch.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ ANONYMOUS:
basalside:
Method: Ioss
Number Of Time Derivatives: 0
Use Serial Mesh: true
Use Serial Mesh: ${USE_SERIAL_MESH}
Exodus Input File Name: antarctica_2d.exo
Cubature Degree: 3
Required Fields Info:
Expand Down
38 changes: 0 additions & 38 deletions tests/small/LandIce/FO_GIS/input_fo_humboldt_muelu.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -615,44 +615,6 @@ ANONYMOUS:
A: myRebalanceAFact
Coordinates: myRebalanceProlongatorFact
Importer: myRepartitionFact
FROSch:
FROSch Preconditioner Type: TwoLevelPreconditioner # FROSch preconditioner type. Options: OneLevelPreconditioner, TwoLevelPreconditioner
OverlappingOperator Type: AlgebraicOverlappingOperator # First Level: AlgebrAlgebraicOverlappingOperator determines the overlap based on the graph of the matrix
CoarseOperator Type: IPOUHarmonicCoarseOperator # Second Level: IPOUHarmonicCoarseOperator work for all kinds of GDSW type coarse spaces
Recycling: true # This enables the possibility to re-use parts of the preconditioner in a Newton or time iteration
Dimension: 3 # Spatial dimension of the problem
DofsPerNode: 2 # Number of degrees of freedom per node
Overlap: 0 # Number of layers of elements in the overlap
Null Space Type: Input # Null space is provided by Albany
AlgebraicOverlappingOperator:
'Reuse: Symbolic Factorization': true # Reuse of the symbolic factorization
Adding Layers Strategy: CrsGraph
Solver: # Solver on the first level
SolverType: Amesos2 # Solver package: Amesos2 or Ifpack2
Solver: Klu # Solver name (depends on the solver package): Klu, RILUK, ...
IPOUHarmonicCoarseOperator:
'Reuse: Coarse Basis': true # Reuse of the coarse basis functions
'Reuse: Coarse Matrix': false # Reuse of the coarse matrix
'Reuse: Coarse Matrix Symbolic Factorization': true # Reuse of the symbolic factorization of the coarse matrix
Blocks:
1: # For a multiphysics problem, the coarse space may be decomposed into several blocks. Here, we only need one block.
InterfacePartitionOfUnity: # The interface partition of unity defines the specific GDSW type coarse space
Type: RGDSW # Possible types: GDSW, RGDSW
GDSW:
Type: Full # Here, we could select subspaces of the GDSW coarse. Generally, we use "Full".
RGDSW:
Type: Full # Here, we could select subspaces of the RGDSW coarse. Generally, we use "Full".
Distance Function: Inverse Euclidean # Options 1 and 2.2 differ in the distance function used to compute the interface values: "Constant" (Option 1) and "Inverse Euclidean" (Option 2.2)
Interface Communication Strategy: CreateOneToOneMap
ExtensionSolver: # Solver for the energy-minimizing extensions
SolverType: Amesos2 # Solver package: Amesos2 or Ifpack2
Solver: Klu # Solver name (depends on the solver package): Klu, RILUK, ...
Distribution: # Parallel distribution of the coarse problem
Type: linear # Specifies the parallel distribution strategy. For now, we use "linear"
NumProcs: 1 # Number of ranks used for the coarse problem
CoarseSolver: # Solver for the coarse problem
SolverType: Amesos2 # Solver package: Amesos2 or Ifpack2
Solver: Klu # Solver name (depends on the solver package): Klu, RILUK, ...
ML:
Base Method Defaults: none
ML Settings:
Expand Down

0 comments on commit dc72444

Please sign in to comment.