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

Framework/Zoltan: Fix Fortran typo #13496

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Framework/Zoltan: Fix Fortran typo #13496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion commonTools/buildTools/external/makefileSupport.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ EXTERNAL_INCLUDES += $(EXTERNAL_INCL_DIR)
# Linker Options
EXTERNAL_LDFLAGS = $(TEUCHOS_LDFLAGS) $(TEUCHOS_LIBS)

# EXTERNAL_C, EXTERNAL_C++ and Fortan compiler options
# EXTERNAL_C, EXTERNAL_C++ and Fortran compiler options

EXTERNAL_CFLAGS = $(TEUCHOS_CFLAGS)
EXTERNAL_CXXFLAGS = $(TEUCHOS_CXXFLAGS)
Expand Down
8 changes: 4 additions & 4 deletions packages/TrilinosInstallTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ tribits_add_advanced_test(reduced_tarball
-D${CMAKE_PROJECT_NAME}_CONFIGURE_OPTIONS_FILE=${${CMAKE_PROJECT_NAME}_CONFIGURE_OPTIONS_FILE}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_Fortan_COMPILER=${CMAKE_Fortran_COMPILER}
-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
-D${CMAKE_PROJECT_NAME}_ENABLE_ALL_PACKAGES=ON
-D${CMAKE_PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES=OFF
../trilinos-${Trilinos_VERSION}-Source
Expand Down Expand Up @@ -112,7 +112,7 @@ tribits_add_advanced_test(simpleBuildAgainstTrilinos_by_package_build_tree
ARGS
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_Fortan_COMPILER=${CMAKE_Fortran_COMPILER}
-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
-DCMAKE_PREFIX_PATH=${PROJECT_BINARY_DIR}/cmake_packages
-DCMAKE_BUILD_TYPE=DEBUG
simpleBuildAgainstTrilinos
Expand Down Expand Up @@ -191,7 +191,7 @@ tribits_add_advanced_test(find_package_Trilinos
ARGS
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_Fortan_COMPILER=${CMAKE_Fortran_COMPILER}
-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
-DCMAKE_PREFIX_PATH=${PROJECT_BINARY_DIR}/install
${CMAKE_CURRENT_SOURCE_DIR}/find_package_Trilinos
PASS_REGULAR_EXPRESSION_ALL
Expand Down Expand Up @@ -234,7 +234,7 @@ tribits_add_advanced_test(simpleBuildAgainstTrilinos
ARGS
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_Fortan_COMPILER=${CMAKE_Fortran_COMPILER}
-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
-DCMAKE_PREFIX_PATH=${PROJECT_BINARY_DIR}/install
-DCMAKE_BUILD_TYPE=DEBUG
${PROJECT_SOURCE_DIR}/demos/simpleBuildAgainstTrilinos
Expand Down
2 changes: 1 addition & 1 deletion packages/zoltan/config/zac_arg_config_mpi.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ if test X${SEEK_MPI_COMPILERS} = Xyes; then
# F77=${MPI_F77}
# else
# echo "-----"
# echo "Cannot find MPI Fortan 77 compiler."
# echo "Cannot find MPI Fortran 77 compiler."
# echo "Specify a path to all mpi compilers with --with-mpi-compilers=PATH,"
# echo "or specify a path to top mpi directory (above bin) with --with-mpi=PATH,"
# echo "or specify a fortran 77 compiler using F77=<compiler>"
Expand Down
2 changes: 1 addition & 1 deletion packages/zoltan/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3333,7 +3333,7 @@ test -n "$MPI_CXX" || MPI_CXX="notFound"
# F77=${MPI_F77}
# else
# echo "-----"
# echo "Cannot find MPI Fortan 77 compiler."
# echo "Cannot find MPI Fortran 77 compiler."
# echo "Specify a path to all mpi compilers with --with-mpi-compilers=PATH,"
# echo "or specify a path to top mpi directory (above bin) with --with-mpi=PATH,"
# echo "or specify a fortran 77 compiler using F77=<compiler>"
Expand Down
2 changes: 1 addition & 1 deletion packages/zoltan/docs/dev_html/dev_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ <h3>
any value <i>p</i>. Note that since the window may be resized with the
mouse, you may not need <i>image height</i> and <i>image width</i>
unless you must have a very specific window size. Also note that if you
ran the Fortan test driver <I>zfdrive</I>, you will need to rename the
ran the Fortran test driver <I>zfdrive</I>, you will need to rename the
output files from <i>file_name</i>.<B>f</B>out.<i>p</i>.<i>n</i> to
<i>file_name</i>.out.<i>p</i>.<i>n</i>.

Expand Down
Loading