[SCM] Gerris Flow Solver branch, upstream, updated. e8f73a07832050124d2b8bf6c6f35b33180e65a8

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 91ba7d4a2c4c861f6d6522ee404b1f64c5b9465d
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Tue Nov 10 00:32:04 2009 +1100

    wavewatch module supports version 3.12
    
    Ignore-this: 2b56782a62230c886a67942ac5c4050b
    
    darcs-hash:20091109133204-fbd8f-48ff3fd5e905d5ccb18474005d7ab11fad61eda1.gz

diff --git a/modules/wavewatch.mod b/modules/wavewatch.mod
index 4c26c6f..7028c27 100644
--- a/modules/wavewatch.mod
+++ b/modules/wavewatch.mod
@@ -24,6 +24,8 @@
 #include "config.h"
 #if WW3_VERSION == 222
 #  include "wavewatch/wavewatch_222.h"
+#elif WW3_VERSION == 312
+#  include "wavewatch/wavewatch_312.h"
 #else /* 3.14 */
 #  include "wavewatch/wavewatch_314.h"
 #endif
@@ -123,6 +125,14 @@ static void source (FttCell * cell, SourceParams * p)
 	  &EMEAN, &FMEAN, &WMEAN, &AMAX, 
 	  &FPI, &CD, &Z0, 
 	  &DTDYN, &FCUT, &DTG, &DTMIN, &DTMAX);
+#elif WW3_VERSION == 312
+  INTEGER IX, IY, IMOD = 1;
+  REAL USTDIR;
+  W3SRCE (&IX, &IY, &IMOD, p->A, p->ALPHA, p->WN, p->CG, &DEPTH, 
+	  &U10ABS, &U10DIR, &USTAR, &USTDIR,
+	  &EMEAN, &FMEAN, &WMEAN, &AMAX, 
+	  &FPI, &CD, &Z0, 
+	  &DTDYN, &FCUT, &DTG);
 #else /* 3.14 */
   INTEGER IX, IY, IMOD = 1;
   REAL AS = p->as ? GFS_VALUE (cell, p->as) : 0.;
@@ -206,12 +216,12 @@ static void initialize (GfsWave * wave)
       "  1 1 1\n"
 #if WW3_VERSION == 222
       "      0   0   F\n"
-#else /* version 3.14 */
+#else /* version 3.12 and 3.14 */
       "   10 3 1 '(....)' 'PART' 'mapsta.inp'\n"
       "      0   0   F\n"
       "      0   0   F\n"
       "      0   0\n"
-#endif /* version 3.14 */
+#endif /* version 3.12 and 3.14 */
       "     0.    0.    0.    0.       0\n";
     fputs (constant_parameters, input);
     fclose (input);
diff --git a/modules/wavewatch/Makefile.am b/modules/wavewatch/Makefile.am
index e80d039..7025b6d 100644
--- a/modules/wavewatch/Makefile.am
+++ b/modules/wavewatch/Makefile.am
@@ -8,7 +8,11 @@ endif
 noinst_LIBRARIES = $(WAVEWATCH)
 noinst_PROGRAMS = $(CHECKTYPES)
 
-EXTRA_DIST = gfsad3 w3init222.ftn w3init314.ftn wavewatch.h fchecktypes.ftn
+EXTRA_DIST = gfsad3 \
+	w3init222.ftn wavewatch_222.h \
+	wavewatch_312.h \
+	w3init314.ftn wavewatch_314.h \
+	fchecktypes.ftn
 
 checktypes_SOURCES = cchecktypes.c
 checktypes_LDADD = fchecktypes.o
@@ -31,3 +35,6 @@ fchecktypes.o: fchecktypes.ftn $(HOME)/.wwatch3.env gfsad3
 
 cfortrantypes.h: checktypes
 	./checktypes > cfortrantypes.h
+
+w3init312.ftn: w3init314.ftn
+	cp -f w3init314.ftn w3init312.ftn
diff --git a/modules/wavewatch/wavewatch_314.h b/modules/wavewatch/wavewatch_312.h
similarity index 98%
copy from modules/wavewatch/wavewatch_314.h
copy to modules/wavewatch/wavewatch_312.h
index a60f136..ec18efe 100644
--- a/modules/wavewatch/wavewatch_314.h
+++ b/modules/wavewatch/wavewatch_312.h
@@ -56,11 +56,8 @@ extern void W3SRCE (INTEGER * IX, INTEGER * IY, INTEGER * IMOD,
 		    REAL * DEPTH, 
 		    REAL * U10ABS, 
 		    REAL * U10DIR, 
-		    REAL * AS,
 		    REAL * USTAR,
 		    REAL * USTDIR,
-		    REAL * CX,
-		    REAL * CY,
 		    REAL * EMEAN,
 		    REAL * FMEAN,
 		    REAL * WMEAN,

-- 
Gerris Flow Solver