[Greater-commits] r3843 - trunk/GREAT-ERModel/doc
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 29 17:20:53 CET 2011
Author: frank
Date: 2011-11-29 17:20:51 +0100 (Tue, 29 Nov 2011)
New Revision: 3843
Modified:
trunk/GREAT-ERModel/doc/emission_model.tex
trunk/GREAT-ERModel/doc/great-er_model.tex
trunk/GREAT-ERModel/doc/river_model.tex
Log:
Typos fixed by Bettina Gruenbauer.
Modified: trunk/GREAT-ERModel/doc/emission_model.tex
===================================================================
--- trunk/GREAT-ERModel/doc/emission_model.tex 2011-11-29 08:52:06 UTC (rev 3842)
+++ trunk/GREAT-ERModel/doc/emission_model.tex 2011-11-29 16:20:51 UTC (rev 3843)
@@ -5,7 +5,7 @@
from annual per capita consumption and the number of inhabitants at a discharge
site. The simple approach allows a clear overview over the elements of the
\classobj{Model} class to be usually overridden and the concepts to implement
-a model uning the GREAT-ER II Model framework.
+a model uning the GREAT-ER 3.0 Model framework.
{\scriptsize
\begin{verbatim}
Modified: trunk/GREAT-ERModel/doc/great-er_model.tex
===================================================================
--- trunk/GREAT-ERModel/doc/great-er_model.tex 2011-11-29 08:52:06 UTC (rev 3842)
+++ trunk/GREAT-ERModel/doc/great-er_model.tex 2011-11-29 16:20:51 UTC (rev 3843)
@@ -227,7 +227,7 @@
\label{chap:General}
This document aims to give an overview about the concepts and implementation of
-the GREAT-ER III Model Suite. The emphasis lies on illustrating how to implement
+the GREAT-ER 3.0 Model Suite. The emphasis lies on illustrating how to implement
new models within the Model Suite. Detailed information about the
implemented classes and methods can be found in the HTML-based
documentation of the class hierarchy\footnote{Files:
@@ -238,7 +238,7 @@
the Monte-Carlo approach.
The flexible, transparent and extensible reimplementation of the GREAT-ER
-Model system was a core task of the GREAT-ER III software development project.
+Model system was a core task of the GREAT-ER 3.0 software development project.
\section{Architecture}
\label{sec:Architecture}
@@ -264,7 +264,7 @@
\begin{center}
\FigNoEntry{\includegraphics[width=0.9\textwidth]
{architecture_single_user.png}}
- {GREAT-ER III Model Suite Architecture:
+ {GREAT-ER 3.0 Model Suite Architecture:
Single User Installation}
\end{center}
\item Scheduler and several Workers on one computer\\
@@ -277,7 +277,7 @@
\begin{center}
\FigNoEntry{\includegraphics[width=0.9\textwidth]
{architecture_computing_server.png}}
- {GREAT-ER III Model Suite Architecture:
+ {GREAT-ER 3.0 Model Suite Architecture:
Computing Server Installation}
\end{center}
@@ -292,7 +292,7 @@
\begin{center}
\FigNoEntry{\includegraphics[width=0.9\textwidth]
{architecture_distributed_computing.png}}
- {GREAT-ER III Model Suite Architecture:
+ {GREAT-ER 3.0 Model Suite Architecture:
Distributed Computing Installation}
\end{center}
\end{itemize}
@@ -328,7 +328,7 @@
\item Stop a running simulation on request.
\end{itemize}
-See the document "GREAT-ER III Model Specification", section "Scheduler"
+See the document "GREAT-ER 3.0 Model Specification", section "Scheduler"
for interface details.
\section{Worker Concept}
@@ -350,13 +350,13 @@
model implementation, which is encapsulated in the Model class
(section \ref{sec:ModelClass}).
-See the document "GREAT-ER III Model Specification", section "Worker"
+See the document "GREAT-ER 3.0 Model Specification", section "Worker"
for interface details.
\section{Implemented Models}
\label{sec:Compartments}
-To prove the new concept of the GREAT-ER III Model Suite the models of GREAT-ER
+To prove the new concept of the GREAT-ER 3.0 Model Suite the models of GREAT-ER
1.0 have been reimplemented. These cover four compartments with various levels
of model complexity:
\begin{itemize}
@@ -389,7 +389,7 @@
\end{itemize}
Chapter \ref{chap:Examples} (page \pageref{chap:Examples}) illustrates
-by some examples how to implement a model for the GREAT-ER III Model Suite.
+by some examples how to implement a model for the GREAT-ER 3.0 Model Suite.
Details about the implemented models are described in the
"GREAT-ER Technical Documentation - Chemical Fate Models".
@@ -428,7 +428,7 @@
}
\end{center}
-The approach for GREAT-ER III extends the segment concept to all models. The
+The approach for GREAT-ER 3.0 extends the segment concept to all models. The
directed graph is not limited to the river network with a static chain of
models linked to a discharge point as described above. The different models are
represented by specific segments and therewith part of the directed graph
@@ -439,7 +439,7 @@
\begin{center}
\FigNoEntry{
\includegraphics[width=0.95\textwidth]{./structure_great-er_2.png}}{
- \label{fig:structure_great-er_2} New system structure for GREAT-ER III
+ \label{fig:structure_great-er_2} New system structure for GREAT-ER 3.0
}
\end{center}
@@ -463,7 +463,7 @@
the core of the directed graph, the
segment objects, as described above. The graph is binary, therewith three
types of segments are sufficient to build the graph: a simple segment, a
-connector and a fork. The segments implementation in independent from the model
+connector and a fork. The segments implementation is independent from the model
implementations following the directed graph concept.
\subsubsection{Segment}
@@ -860,7 +860,7 @@
The \classobj{Data} class implements the read access to the data base.
Initialized with a session ID all required data can be loaded depending on the
requested Worker action. A worker has one \classobj{Data} object, all Model
-objects store a pointer the this global source of data. The \classobj{Data}
+objects store a pointer to this global source of data. The \classobj{Data}
object stores connection data and the session ID and provides a dictionary
(\varname{data}), which keys are set according to the loaded data (e.g,
'SESSION', 'STRETCH', 'DISCHARGE', 'SUBST', etc.).
@@ -1179,7 +1179,7 @@
%
% CHAPTER
-% Implement a model for GREAT-ER II
+% Implement a model for GREAT-ER 3.0
%
\chapter{Core Model System}
\label{chap:ModelImplementation}
@@ -1190,7 +1190,7 @@
previous chapter introduced some objects and methods used to implement a model
this chapter is concentrating on the model itself.
-The core of the GREAT-ER III Model Suite is
+The core of the GREAT-ER 3.0 Model Suite is
represented in two files, \gfilename{model.py} and \gfilename{modelbase.py},
while the implementation of specific models is placed in separate files.
\begin{itemize}
@@ -1207,7 +1207,7 @@
\label{sec:ModelList}
The \varname{ModelList} stores a list off all models implemented by the
-GREAT-ER III Model Suite as a list of Python tuples. Hook in each new
+GREAT-ER 3.0 Model Suite as a list of Python tuples. Hook in each new
implemented model here with an entry of three values.
The following grammar in Backus-Naur
@@ -1254,13 +1254,13 @@
Parameter Information, Simulation and Administrative Framework.
Depending on the specific model implementation some of the methods
have to be overridden. The methods are discussed below followed by some
-examples illustrating the implementation of models with the GREAT-ER III Model
+examples illustrating the implementation of models with the GREAT-ER 3.0 Model
Suite.
\subsection{Parameter information}
\label{subsec:Parameter}
-The GREAT-ER III Model Suite architecture requires the parameters needed for a
+The GREAT-ER 3.0 Model Suite architecture requires the parameters needed for a
simulation to be hard coded in the model. Since all model equations are
implemented
here as well a unique location is available to store the most relevant
@@ -1479,7 +1479,7 @@
The method is called with the segmentID (which is fixed at this stage)
as a reference to the segment in the graph. In addition the
\classobj{StochasticResult} objects needed by the model are
- initialized and stored in in the \varname{Result} dictionary.
+ initialized and stored in the \varname{Result} dictionary.
Since the generic method does not load any data it has to be
overridden when implementing a new model.
@@ -1701,7 +1701,7 @@
\label{subsubsec:Model.StochasticParameters}
Description &
Return the list of parameters considered as distributed for the specific
-segment according to the to the model mode selections and parameter settings.
+segment according to the model mode selections and parameter settings.
By default (\varname{parameter\_list} and \varname{correlated\_parameters}
are \varvalue{None}) process the model's
lists. If available the method is called
@@ -2014,7 +2014,7 @@
\label{chap:Examples}
\section{Model Overview}
-Based on the Model Class and its framework the GREAT-ER III Model Suite
+Based on the Model Class and its framework the GREAT-ER 3.0 Model Suite
implements the models of GREAT-ER 1.0:
\begin{itemize}
@@ -2094,7 +2094,7 @@
\include{river_model}
-%\chapter{Enhance GREAT-ER III with a new compartment}
+%\chapter{Enhance GREAT-ER 3.0 with a new compartment}
%\label{chap:ModelEnhancement}
%-------------------------Appendix-------------------------------------
Modified: trunk/GREAT-ERModel/doc/river_model.tex
===================================================================
--- trunk/GREAT-ERModel/doc/river_model.tex 2011-11-29 08:52:06 UTC (rev 3842)
+++ trunk/GREAT-ERModel/doc/river_model.tex 2011-11-29 16:20:51 UTC (rev 3843)
@@ -2,7 +2,7 @@
\label{subsubsec:river_mode1}
While the Household Emission model introduced the very basic concepts of the
-model implementation in the GREAT-ER II Model Suite, the River model mode 2
+model implementation in the GREAT-ER 3.0 Model Suite, the River model mode 2
presents further items like results or estimate functions.
This section
@@ -215,7 +215,7 @@
\item Fractioning values are depending on potentially distributed
parameters and therewith have to be computed per Monte Carlo shot.
\item Check all values used as quotient to avoid a division by zero.
- If a division by zero would coccur, consider the stretch segment
+ If a division by zero would occur, consider the stretch segment
as virtual, store invalid results and hand through the mass flux
income.
\item Else, calculate the hydraulic residence time, the first order
More information about the Greater-commits
mailing list