[Greater-commits] r3812 - trunk/GREAT-ERModel/doc
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Oct 14 10:29:04 CEST 2011
Author: aheinecke
Date: 2011-10-14 10:29:03 +0200 (Fri, 14 Oct 2011)
New Revision: 3812
Modified:
trunk/GREAT-ERModel/doc/great-er_model.tex
trunk/GREAT-ERModel/doc/great-er_model_concept.tex
trunk/GREAT-ERModel/doc/great-er_model_specification.tex
Log:
Update Versions
Modified: trunk/GREAT-ERModel/doc/great-er_model.tex
===================================================================
--- trunk/GREAT-ERModel/doc/great-er_model.tex 2011-10-13 20:44:46 UTC (rev 3811)
+++ trunk/GREAT-ERModel/doc/great-er_model.tex 2011-10-14 08:29:03 UTC (rev 3812)
@@ -1,4 +1,4 @@
-\documentclass[a4paper,12pt,twoside,BCOR19mm]{scrbook}
+\documentclass[a4paper,11pt,oneside,openright,titlepage]{scrbook}
%----------------------------------------------
% PACKAGE MANAGEMENT
@@ -20,11 +20,10 @@
\def\cleanunderscore#1_#2{\expandafter #1\_#2}
\def\CVS$#1: #2 ${\expandafter\def\csname CVS#1\endcsname{\cleanunderscore#2}}
-\CVS$Id: great-er_model.tex,v 1.8 2005-03-01 16:25:33 frank Exp $
-\newcommand{\documentdate}{July 28, 2003}
-\newcommand{\documentversion}{1.0.0}
-\newcommand{\documentID}{\CVSId}
+\newcommand{\documentdate}{October 14, 2011}
+\newcommand{\documentversion}{1.1.0}
+\newcommand{\documentID}{}
%----------------------------------------------
% MACRO DEFINITION
%
@@ -155,8 +154,8 @@
{
\sffamily\bfseries\Large
% e.g.:
- GREAT-ER II\\[0.5cm]
- \huge Description GREAT-ER II Model Suite\\[4cm]
+ GREAT-ER III\\[0.5cm]
+ \huge Description GREAT-ER III Model Suite\\[4cm]
}
@@ -172,7 +171,7 @@
{\sffamily\small
Intevation GmbH\\
- Georgstrasse 4\\
+ Neuer Graben 17\\
49074 Osnabrück\\
Germany\\
\\
@@ -197,13 +196,14 @@
Related documents:
\begin{itemize}
-\item Specification GREAT-ER II Model Suite, \\Intevation GmbH, 2003
+\item GREAT-ER Manual, \\Intevation GmbH, 2011
+\item GREAT-ER Model Specification, \\Intevation GmbH, 2011
\item GREAT-ER Technical Documentation - Chemical Fate Models\\
Geert Boeije, University of Gent, 1999
\end{itemize}
\vfill
-\begin{center}Copyright (c) 2002 Intevation GmbH.\end{center}
+\begin{center}Copyright (c) 2011 Intevation GmbH.\end{center}
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2
@@ -233,7 +233,7 @@
\label{chap:General}
This document aims to give an overview about the concepts and implementation of
-the GREAT-ER II Model Suite. The emphasis lies on illustrating how to implement
+the GREAT-ER III 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:
@@ -244,7 +244,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 II software development project.
+Model system was a core task of the GREAT-ER III software development project.
\section{Architecture}
\label{sec:Architecture}
@@ -270,7 +270,7 @@
\begin{center}
\FigNoEntry{\includegraphics[width=0.9\textwidth]
{architecture_single_user.eps}}
- {GREAT-ER II Model Suite Architecture:
+ {GREAT-ER III Model Suite Architecture:
Single User Installation}
\end{center}
\item Scheduler and several Workers on one computer\\
@@ -283,7 +283,7 @@
\begin{center}
\FigNoEntry{\includegraphics[width=0.9\textwidth]
{architecture_computing_server.eps}}
- {GREAT-ER II Model Suite Architecture:
+ {GREAT-ER III Model Suite Architecture:
Computing Server Installation}
\end{center}
@@ -298,7 +298,7 @@
\begin{center}
\FigNoEntry{\includegraphics[width=0.9\textwidth]
{architecture_distributed_computing.eps}}
- {GREAT-ER II Model Suite Architecture:
+ {GREAT-ER III Model Suite Architecture:
Distributed Computing Installation}
\end{center}
\end{itemize}
@@ -334,7 +334,7 @@
\item Stop a running simulation on request.
\end{itemize}
-See the document "GREAT-ER II Model Specification", section "Scheduler"
+See the document "GREAT-ER III Model Specification", section "Scheduler"
for interface details.
\section{Worker Concept}
@@ -356,13 +356,13 @@
model implementation, which is encapsulated in the Model class
(section \ref{sec:ModelClass}).
-See the document "GREAT-ER II Model Specification", section "Worker"
+See the document "GREAT-ER III Model Specification", section "Worker"
for interface details.
\section{Implemented Models}
\label{sec:Compartments}
-To prove the new concept of the GREAT-ER II Model Suite the models of GREAT-ER
+To prove the new concept of the GREAT-ER III Model Suite the models of GREAT-ER
1.0 have been reimplemented. These cover four compartments with various levels
of model complexity:
\begin{itemize}
@@ -395,7 +395,7 @@
\end{itemize}
Chapter \ref{chap:Examples} (page \pageref{chap:Examples}) illustrates
-by some examples how to implement a model for the GREAT-ER II Model Suite.
+by some examples how to implement a model for the GREAT-ER III Model Suite.
Details about the implemented models are described in the
"GREAT-ER Technical Documentation - Chemical Fate Models".
@@ -434,7 +434,7 @@
}
\end{center}
-The approach for GREAT-ER II extends the segment concept to all models. The
+The approach for GREAT-ER III 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
@@ -445,7 +445,7 @@
\begin{center}
\FigNoEntry{
\includegraphics[width=0.95\textwidth]{./structure_great-er_2.eps}}{
- \label{fig:structure_great-er_2} New system structure for GREAT-ER II
+ \label{fig:structure_great-er_2} New system structure for GREAT-ER III
}
\end{center}
@@ -1196,7 +1196,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 II Model Suite is
+The core of the GREAT-ER III 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}
@@ -1213,7 +1213,7 @@
\label{sec:ModelList}
The \varname{ModelList} stores a list off all models implemented by the
-GREAT-ER II Model Suite as a list of Python tuples. Hook in each new
+GREAT-ER III 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
@@ -1260,13 +1260,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 II Model
+examples illustrating the implementation of models with the GREAT-ER III Model
Suite.
\subsection{Parameter information}
\label{subsec:Parameter}
-The GREAT-ER II Model Suite architecture requires the parameters needed for a
+The GREAT-ER III 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
@@ -2020,7 +2020,7 @@
\label{chap:Examples}
\section{Model Overview}
-Based on the Model Class and its framework the GREAT-ER II Model Suite
+Based on the Model Class and its framework the GREAT-ER III Model Suite
implements the models of GREAT-ER 1.0:
\begin{itemize}
@@ -2100,7 +2100,7 @@
\include{river_model}
-%\chapter{Enhance GREAT-ER II with a new compartment}
+%\chapter{Enhance GREAT-ER III with a new compartment}
%\label{chap:ModelEnhancement}
%-------------------------Appendix-------------------------------------
Modified: trunk/GREAT-ERModel/doc/great-er_model_concept.tex
===================================================================
--- trunk/GREAT-ERModel/doc/great-er_model_concept.tex 2011-10-13 20:44:46 UTC (rev 3811)
+++ trunk/GREAT-ERModel/doc/great-er_model_concept.tex 2011-10-14 08:29:03 UTC (rev 3812)
@@ -11,7 +11,7 @@
\label{fig:ComponentOverview}GREAT-ER Model Suite Component Overview}
\end{center}
-Figure 1.\ref{fig:ComponentOverview} gives an overview of the GREAT-ER II
+Figure 1.\ref{fig:ComponentOverview} gives an overview of the GREAT-ER III
architecture and the components covered by this specification.
Components with direct relation to GREAT-ER Model Suite are displayed in
gray, others in white.
@@ -153,7 +153,7 @@
}
\end{center}
-The approach for GREAT-ER II extends the segment concept to all models. The
+The approach for GREAT-ER III 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
@@ -164,7 +164,7 @@
\begin{center}
\FigNoEntry{
\includegraphics[width=0.95\textwidth]{./structure_great-er_2.eps}}{
- \label{fig:structure_great-er_2} New system structure for GREAT-ER II
+ \label{fig:structure_great-er_2} New system structure for GREAT-ER III
}
\end{center}
\clearpage
Modified: trunk/GREAT-ERModel/doc/great-er_model_specification.tex
===================================================================
--- trunk/GREAT-ERModel/doc/great-er_model_specification.tex 2011-10-13 20:44:46 UTC (rev 3811)
+++ trunk/GREAT-ERModel/doc/great-er_model_specification.tex 2011-10-14 08:29:03 UTC (rev 3812)
@@ -1,4 +1,4 @@
-\documentclass[a4paper,twoside,BCOR19mm]{scrbook}
+\documentclass[a4paper,11pt,oneside,openright,titlepage]{scrbook}
%----------------------------------------------
% PACKAGE MANAGEMENT
@@ -20,11 +20,10 @@
\def\cleanunderscore#1_#2_#3{\expandafter #1\_#2\_#3}
\def\CVS$#1: #2 ${\expandafter\def\csname CVS#1\endcsname{\cleanunderscore#2}}
-\CVS$Id: great-er_model_specification.tex,v 1.13 2003-07-28 13:01:33 frank Exp $
-\newcommand{\documentdate}{July 28, 2003}
-\newcommand{\documentversion}{1.0.0}
-\newcommand{\documentID}{\CVSId}
+\newcommand{\documentdate}{October 14, 2011}
+\newcommand{\documentversion}{1.1.0}
+\newcommand{\documentID}{}
%----------------------------------------------
% MACRO DEFINITION
@@ -152,7 +151,7 @@
{
\sffamily\bfseries\Large
% e.g.:
- GREAT-ER II\\[0.5cm]
+ GREAT-ER III\\[0.5cm]
\huge Specification GREAT-ER Model Suite\\[4cm]
}
@@ -169,7 +168,7 @@
{\sffamily\small
Intevation GmbH\\
- Georgstrasse 4\\
+ Neuer Graben 17\\
49074 Osnabrück\\
Germany\\
\\
More information about the Greater-commits
mailing list