summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authoreschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>2014-04-19 11:01:12 +0000
committereschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>2014-04-19 11:01:12 +0000
commitc403f2c1810cf1553d047303e09f5c7ccc0ba7df (patch)
treea032ed862f88020d99c9ee66fd16e674f6b51c34 /doc
parent568c2e3b24c630b01e0f3d4c62a536756c1fc561 (diff)
Drop explicit support for Fortran 77 in Cactus
This patch drops explicit support for Fortran 77 in Cactus. Fortran 77 is, for all practical purposes, a subset of Fortran 90, and thus Fortran 77 code can be compiled by Fortran 90 compilers. There is currently no platform that has a Fortran 77 and no Fortran 90 compiler, and there is no Fortran source code in Cactus that cannot be compiled by a Fortran 90 compiler. This patch removes/ignores all configuration options regarding Fortran 77, and compiles .f77 and .F77 files with a Fortran 90 compiler. This simplifies the configuration stage of Cactus. git-svn-id: http://svn.cactuscode.org/flesh/trunk@5108 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'doc')
-rw-r--r--doc/UsersGuide.pdfbin718198 -> 717550 bytes
-rw-r--r--doc/UsersGuide/Appendices.tex4
-rw-r--r--doc/UsersGuide/ApplicationThorns.tex32
-rw-r--r--doc/UsersGuide/Notes.tex40
4 files changed, 36 insertions, 40 deletions
diff --git a/doc/UsersGuide.pdf b/doc/UsersGuide.pdf
index 733d239c..0ec09e8a 100644
--- a/doc/UsersGuide.pdf
+++ b/doc/UsersGuide.pdf
Binary files differ
diff --git a/doc/UsersGuide/Appendices.tex b/doc/UsersGuide/Appendices.tex
index 126c65a8..37722b1c 100644
--- a/doc/UsersGuide/Appendices.tex
+++ b/doc/UsersGuide/Appendices.tex
@@ -57,8 +57,8 @@ http://en.wikipedia.org/wiki/Cactus
\item[configuration]
The combination of a set of thorns, and all the Cactus configure
options which affect what binary will be produced when compiling
- Cactus. For example, the choice of compilers (Cactus \verb|CC|, \verb|CUCC|,
- \verb|CXX|, \verb|F77|, and \verb|F90| configure options) and the
+ Cactus. For example, the choice of compilers (Cactus \verb|CC|,
+ \verb|CXX|, \verb|CUCC|, and \verb|F90| configure options) and the
compiler optimization settings (\verb|OPTIMISE|/\verb|OPTIMIZE| and
\verb|*_OPTIMISE_FLAGS| configure options) are part of a
configuration (these flags change what binary is produced), but the
diff --git a/doc/UsersGuide/ApplicationThorns.tex b/doc/UsersGuide/ApplicationThorns.tex
index 0b21bd77..48dcc93a 100644
--- a/doc/UsersGuide/ApplicationThorns.tex
+++ b/doc/UsersGuide/ApplicationThorns.tex
@@ -770,18 +770,16 @@ The following extensions are understood:
\begin{center}
\begin{tabular}{|l|c|c|c|}
\hline
-Extension & Language & Format & Preprocess \\
+Extension & Language & Preprocess \\
\hline
-{\t .c} & C & - & yes \\
-{\t .cc} or {\t .C} & C++ & - & yes \\
-{\t .cl} & OpenCL & - & yes \\
-{\t .cu} & CUDA & - & yes \\
-{\t .F77} & Fortran 77 & fixed & yes \\
-{\t .f77} & Fortran 77 & fixed & no \\
-{\t .F} & Fortran 90 & fixed & yes \\
-{\t .f} & Fortran 90 & fixed & no \\
-{\t .F90} & Fortran 90 & free & yes \\
-{\t .f90} & Fortran 90 & free & no \\
+{\t .c} & C & yes \\
+{\t .cc} or {\t .C} & C++ & yes \\
+{\t .cl} & OpenCL & yes \\
+{\t .cu} & CUDA & yes \\
+{\t .F} or {\t .F77} & Fortran (fixed-format) & yes \\
+{\t .f} or {\t .f77} & Fortran (fixed-format) & no \\
+{\t .F90} & Fortran (free-format) & yes \\
+{\t .f90} & Fortran (free-format) & no \\
\hline
\end{tabular}
\end{center}
@@ -790,7 +788,7 @@ In order to use Cactus \texttt{\#include} directives in a file, it must be
preprocessed.
A complete description of Fortran fixed and free format can be found in any
-textbook on Fortran 90. The most obvious differences are that in fixed
+textbook on Fortran. The most obvious differences are that in fixed
format, code must begin after the 5th column and line continuations are
indicated by a character in column 5, while in free format, lines can begin
anywhere, and line continuations are indicated by an ampersand at the end of
@@ -802,7 +800,7 @@ The following restrictions apply to file names:
\item For portability across all operating systems, the base names
for any particular extension should not depend on the operating
system being case sensitive (e.g.\ having \texttt{MyFile.c} and
- \texttt{MYFILE.f77} is allright, but \texttt{MyFile.c} and
+ \texttt{MYFILE.f} is allright, but \texttt{MyFile.c} and
\texttt{MYFILE.c} could cause problems).
\item Currently, all source files within a thorn must have distinct names,
regardless of whether they are placed in different subdirectories. We hope
@@ -889,15 +887,13 @@ and has a working directory of
\item \texttt{CC}: The C compiler
\item \texttt{CXX}: The C++ compiler
\item \texttt{CUCC}: The CUDA compiler
-\item \texttt{F77}: The Fortran 77 compiler. This is only used if
- there is no Fortran 90 compiler
-\item \texttt{F90}: The Fortran 90 compiler. If this variable is
- set, it is also used to compile Fortran 77 files
+\item \texttt{F90}: The Fortran compiler
+\item \texttt{F77}: Same as \texttt{F90}
\item \texttt{CFLAGS}: Flags which are passed to \texttt{CC}
\item \texttt{CXXFLAGS}: Flags which are passed to \texttt{CXX}
\item \texttt{CUCCFLAGS}: Flags which are passed to \texttt{CUDA}
-\item \texttt{F77FLAGS}: Flags which are passed to \texttt{F77}
\item \texttt{F90FLAGS}: Flags which are passed to \texttt{F90}
+\item \texttt{F77FLAGS}: Same as \texttt{F90FLAGS}
\item \texttt{LD}: The binder. This should not be directly
\texttt{ld}, but should be a compiler driver such as C++.
Often, \texttt{LD} is the same as \texttt{CXX}
diff --git a/doc/UsersGuide/Notes.tex b/doc/UsersGuide/Notes.tex
index 7cb14c7e..4778c3e8 100644
--- a/doc/UsersGuide/Notes.tex
+++ b/doc/UsersGuide/Notes.tex
@@ -80,7 +80,7 @@ If you are using any thorns containing routines
written in CUDA (Compute Unified Device Architecture), a parallel
computing architecture developed by NVIDIA, you also need
\begin{Lentry}
-\item[CUCC] CUDA compiler. For example, the NVIDIA C compiler. In many
+\item[CUCC] a CUDA compiler. For example, the NVIDIA C compiler. In many
cases, you can compile your C and C++ code with a CUDA compiler without
encountering any problems, but you are advised to use a CUDA compiler exclusively
for CUDA code.
@@ -90,10 +90,7 @@ for CUDA code.
If you are using any thorns containing routines
written in Fortran you also need
\begin{Lentry}
-\item[F90/F77] For routines written in Fortran 77, either a Fortran 90 or
- a Fortran 77 compiler can be used. For routines written in Fortran 90,
- a Fortran 90 compiler is obviously required. There is a very limited set of
- free Fortran 90 compilers available for the different architectures.
+\item[F90] a Fortran compiler.
\end{Lentry}
\noindent
@@ -282,10 +279,10 @@ by * may be specified on the command line.
\begin{Lentry}
\item [\texttt{CC}] * The C compiler.
-\item [\texttt{CUCC}] * The CUDA compiler.
\item [\texttt{CXX}] The C++ compiler.
-\item [\texttt{F90}] * The Fortran 90 compiler.
-\item [\texttt{F77}] * The Fortran 77 compiler.
+\item [\texttt{CUCC}] * The CUDA compiler.
+\item [\texttt{F90}] * The Fortran compiler.
+\item [\texttt{F77}] * Ignored
\item [\texttt{CPP}] The preprocessor used to generate dependencies
for and to preprocess C and C++ code.
\item [\texttt{FPP}] The preprocessor used to generate dependencies
@@ -320,10 +317,10 @@ Flags for the CUDA compiler.
Flags for the C++ compiler.
\item [\texttt{F90FLAGS}]
-* Flags for the Fortran 90 compiler.
+* Flags for the Fortran compiler.
\item [\texttt{F77FLAGS}]
-* Flags for the Fortran 77 compiler.
+* Ignored
\item [\texttt{CPPFLAGS}]
Flags for the preprocessor (used to generate compilation dependencies
@@ -404,8 +401,7 @@ Debug flags for the Fortran 90 compiler, their use depends on the
type of debugging being used.
\item [\texttt{F77\_DEBUG\_FLAGS}]
-Debug flags for the Fortran 77 compiler, their use depends on the
-type of debugging being used.
+Ignored.
\item [\texttt{OPTIMISE, OPTIMIZE}]
* Specifies what type of optimisation should be used. The only options currently
@@ -430,21 +426,27 @@ Optimisation flags for the Fortran 90 compiler, their use depends on the
type of optimisation being used.
\item [\texttt{F77\_OPTIMISE\_FLAGS}]
-Optimisation flags for the Fortran 77 compiler, their use depends on the
-type of optimisation being used.
+Ignored.
\item [\texttt{C\_NO\_OPTIMISE\_FLAGS}]
+Optimisation flags used to indicate that no optimisation should be
+performed. These are invoked when OPTIMISE=no is used.
\item [\texttt{CUCC\_NO\_OPTIMISE\_FLAGS}]
+Optimisation flags used to indicate that no optimisation should be
+performed. These are invoked when OPTIMISE=no is used.
\item [\texttt{CXX\_NO\_OPTIMISE\_FLAGS}]
+Optimisation flags used to indicate that no optimisation should be
+performed. These are invoked when OPTIMISE=no is used.
\item [\texttt{F90\_NO\_OPTIMISE\_FLAGS}]
-
-\item [\texttt{F77\_NO\_OPTIMISE\_FLAGS}]
Optimisation flags used to indicate that no optimisation should be
performed. These are invoked when OPTIMISE=no is used.
+\item [\texttt{F77\_NO\_OPTIMISE\_FLAGS}]
+Ignored.
+
\item [\texttt{PROFILE}]
* Specifies what type of profiling should be used. The only options
currently available are \texttt{yes} and \texttt{no}. The default
@@ -467,8 +469,7 @@ performed. These are invoked when OPTIMISE=no is used.
type of profiling being used.
\item [\texttt{F77\_PROFILE\_FLAGS}]
- Profile flags for the Fortran 77 compiler, their use depends on the
- type of profiling being used.
+ Ignored.
\item [\texttt{WARN}]
* Specifies what type of build warnings should be used. The only
@@ -492,8 +493,7 @@ Warning flags for the Fortran 90 compiler, their use depends on the type of
warnings used during compilation (Section \ref{sec:gmopfobuco}).
\item [\texttt{F77\_WARN\_FLAGS}]
-Warning flags for the Fortran 77 compiler, their use depends on the type of
-warnings used during compilation (Section \ref{sec:gmopfobuco}).
+Ignored.
\end{Lentry}