Merge pull request #8 from KWB-R/dev

Prepare release 3.2.2

Author: hsonne

.gitignore

@@ -0,0 +1,4 @@
+build-*
+*.dbf
+src/Abimo.pro.user
+config.xml

src/Abimo.pro

@@ -2,17 +2,20 @@
 # Automatically generated by qmake (2.01a) Do 23. Jul 17:34:51 2009
 # #####################################################################
 TEMPLATE = app
-TARGET = 
+TARGET = Abimo
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += xml
+QT += xml widgets core
+CONFIG += console
 
 # Input
 HEADERS += bagrov.h \
     calculation.h \
+    constants.h \
     dbaseField.h \
     dbaseReader.h \
     dbaseWriter.h \
+    helpers.h \
     initvalues.h \
     mainwindow.h \
     pdr.h \
@@ -22,10 +25,12 @@ SOURCES += bagrov.cpp \
     dbaseField.cpp \
     dbaseReader.cpp \
     dbaseWriter.cpp \
+    helpers.cpp \
     initvalues.cpp \
     main.cpp \
     mainwindow.cpp \
     pdr.cpp \
     saxhandler.cpp
 RC_FILE += AbimoQt.rc
 OTHER_FILES += release/config.xml
+INSTALLS += TARGET

src/bagrov.cpp

@@ -17,6 +17,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <math.h>
+
 #include "bagrov.h"
 
 /*
@@ -31,13 +33,17 @@
     Mittlere reale Verdunstung [mm/a]
  =======================================================================================================================
  */
+
+Bagrov::Bagrov()
+{
+}
+
 void Bagrov::nbagro(float *bage, float *y, float *x)
 {
-    /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-    int				_do0, i, i_, ia, ie, j, j_;
-    float			bag, bag1;
-    float			a, a0, a1, a2, b, c, epa, eyn, h, h13, h23, qbag1, s1, s2, w, w13, w23, y0;
-    static float	aa[16] =
+    int _do0, i, i_, ia, ie, j;
+    float bag, bag1;
+    float a, a0, a1, a2, b, c, epa, eyn, h, h13, h23, qbag1, s1, s2, w, w13, w23, y0;
+    static float aa[16] =
     {
         0.9946811499F,
         1.213648255F,
@@ -56,7 +62,6 @@ void Bagrov::nbagro(float *bage, float *y, float *x)
         -24573.23867F,
         6515.556685F
     };
-    /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
     y0 = 0.0F;
     bag = *bage;
@@ -85,6 +90,7 @@ void Bagrov::nbagro(float *bage, float *y, float *x)
         b = 0.5F * a1 - (float) sqrt(0.25 * a1 * a1 - a2);
     else
         b = -(float) sqrt(0.5F * a1 * a1 - a2);
+
     c = a1 - b;
     a = a0 / (b - c);
 
@@ -101,7 +107,6 @@ void Bagrov::nbagro(float *bage, float *y, float *x)
     /* NUMERISCHE INTEGRATION FUER BAG<0.7 (2.Naeherungsloesung) */
     for (j = 1; j <= 30; j++)
     {
-        j_ = j - 1;
         eyn = (float) exp(bag * log(y0));
         if (eyn > 0.9F) goto L_13;
         if (eyn >= 0.7F && bag > 4.0F) goto L_13;
@@ -162,17 +167,13 @@ void Bagrov::nbagro(float *bage, float *y, float *x)
  */
 void Bagrov::bagrov(float *bagf, float *x0, float *y0)
 {
-    /*~~~~~~~~~~~~~~~~~~~~~~~~*/
-    bool	doloop; /* LOGICAL16 */
-    int		_do0, i, ii, ii_, j;
-    /*~~~~~~~~~~~~~~~~~~~~~~~~*/
+    bool doloop; /* LOGICAL16 */
+    int _do0, i, ii, j;
 
-    /* meiko : initialisiere i (einzige Änderung) */
+    /* meiko : initialisiere i (einzige Aenderung) */
     i = 0;
 
-    /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
     float	delta, du, h, s, s1, sg, si, su, u, x;
-    /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
     if (*x0 == 0.0) goto L_10;
     *y0 = 0.99F;
@@ -198,9 +199,9 @@ void Bagrov::bagrov(float *bagf, float *x0, float *y0)
     u = du / 2.0F;
     sg = sg + su;
     su = 0.0F;
+
     for (ii = 1, _do0 = j; ii <= _do0; ii += 2)
     {
-        ii_ = ii - 1;
         su = su + 1.0F / (1.0F - (float) exp(*bagf * log(u)));
         u = u + du;
     }

src/bagrov.h

@@ -17,22 +17,16 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef BAGROV_H	/* Prevent multiple includes */
+#ifndef BAGROV_H /* Prevent multiple includes */
 #define BAGROV_H
-#include <math.h>
-class	Bagrov
+
+class Bagrov
 {
-    /*
-     -----------------------------------------------------------------------------------------------------------------------
-     -----------------------------------------------------------------------------------------------------------------------
-     */
+
 public:
-    /*
-     ===================================================================================================================
-     ===================================================================================================================
-     */
-    Bagrov()	{ }
-    void	nbagro(float *bage, float *y, float *x);
-    void	bagrov(float *bagf, float *x0, float *y0);
+    Bagrov();
+    void nbagro(float *bage, float *y, float *x);
+    void bagrov(float *bagf, float *x0, float *y0);
 };
+
 #endif