Merge branch 'fb_ounf3' of github.com:CarstenHansen/WW3 into fb_stvp

Author: CarstenHansen

README.md

@@ -1,23 +1,25 @@
 # The WAVEWATCH III Framework
 
-WAVEWATCH III<sup>&reg;</sup>  is a community wave modeling framework that includes the 
+WAVEWATCH III<sup>&reg;</sup>  is a community wave modeling framework that includes the
 latest scientific advancements in the field of wind-wave modeling and dynamics.
 
 ## General Features
 
-WAVEWATCH III<sup>&reg;</sup> solves the random phase spectral action density 
-balance equation for wavenumber-direction spectra. The model includes options 
-for shallow-water (surf zone) applications, as well as wetting and drying of 
-grid points. Propagation of a wave spectrum can be solved using regular 
-(rectilinear or curvilinear) and unstructured (triangular) grids. See 
-[About WW3](https://github.com/NOAA-EMC/WW3/wiki/About-WW3) for a 
-detailed description of WAVEWATCH III<sup>&reg;</sup> .
+WAVEWATCH III<sup>&reg;</sup> solves the random phase spectral action density
+balance equation for wavenumber-direction spectra. The model includes options
+for shallow-water (surf zone) applications, as well as wetting and drying of
+grid points. Propagation of a wave spectrum can be solved using regular
+(rectilinear or curvilinear) and unstructured (triangular) grids. See
+[About WW3](https://github.com/NOAA-EMC/WW3/wiki/About-WW3) for a
+detailed description of WAVEWATCH III<sup>&reg;</sup>. For a web-based
+view of the WAVEWATCH III<sup>&reg;</sup> source code
+refer to the [WW3 doxygen documentation](https://noaa-emc.github.io/WW3).
 
 ## Installation
 
-The WAVEWATCH III<sup>&reg;</sup>  framework package has two parts that need to be combined so 
-all runs smoothly: the GitHub repo itself, and a binary data file bundle that 
-needs to be obtained from our ftp site. Steps to successfully acquire and install 
+The WAVEWATCH III<sup>&reg;</sup>  framework package has two parts that need to be combined so
+all runs smoothly: the GitHub repo itself, and a binary data file bundle that
+needs to be obtained from our ftp site. Steps to successfully acquire and install
 the framework are outlined in our [Quick Start](https://github.com/NOAA-EMC/WW3/wiki/Quick-Start)
 guide.
 
@@ -35,4 +37,3 @@ endorsement, recommendation or favoring by the Department of Commerce. The
 Department of Commerce seal and logo, or the seal and logo of a DOC bureau,
 shall not be used in any manner to imply endorsement of any commercial product
 or activity by DOC or the United States Government.
-

model/nml/ww3_shel.nml

@@ -317,6 +317,27 @@
 
 
 
+! -------------------------------------------------------------------- !
+! Define user-defined output paths via OUTPUT_PATH_NML namelist
+!
+! * user-defined paths include: raw output out_grd, out_pnt, and restart
+! * default path for these are set as './'
+! * NOTE: using user-defined path may cause post-processing fail
+!         user-defined directroy must exist before execution
+!
+! * namelist must be terminated with /
+! * definitions & defaults:
+!      PATH%GRD_OUT = './'
+!      PATH%PNT_OUT = './'
+!      PATH%RST_OUT = './'
+! -------------------------------------------------------------------- !
+&OUTPUT_PATH_NML
+  PATH%GRD_OUT = './'
+/
+
+
+
+
 ! -------------------------------------------------------------------- !
 ! Define homogeneous input via HOMOG_COUNT_NML and HOMOG_INPUT_NML namelist
 !

model/src/w3gdatmd.F90

@@ -2118,7 +2118,7 @@ SUBROUTINE W3DIMS  ( IMOD, MK, MTH, NDSE, NDST )
          MPARS(IMOD)%SRCPS%CUMULW(MSPEC,MSPEC),        &
          STAT=ISTAT                                   )
     CHECK_ALLOC_STATUS ( ISTAT )
-    MPARS(IMOD)%SRCPS%SATINDICES(:,:)=0.
+    MPARS(IMOD)%SRCPS%SATINDICES(:,:)=1.
     MPARS(IMOD)%SRCPS%SATWEIGHTS(:,:)=0.
     MPARS(IMOD)%SRCPS%CUMULW(:,:)=0.
 #endif

model/src/w3gridmd.F90

@@ -851,7 +851,7 @@ MODULE W3GRIDMD
 #ifdef W3_ST4
   INTEGER                 :: SWELLFPAR, SDSISO, SDSBRFDF, SINTABLE,&
                              TAUWBUG
-  REAL 		   :: SDSBCHOICE
+  REAL                    :: SDSBCHOICE                     
   REAL                    :: ZWND, ALPHA0, Z0MAX, BETAMAX, SINTHP,&
        ZALP, Z0RAT, TAUWSHELTER, SWELLF,    &
        SWELLF2,SWELLF3,SWELLF4, SWELLF5,    &

model/src/w3initmd.F90

@@ -658,7 +658,6 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
       STOP
     ENDIF
 #endif
-
     !
     ! 1.c Open files without unpacking MDS ,,,
     !
@@ -1240,7 +1239,11 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
     !
     ! 4.d Preprocessing for point output.
     !
-    IF ( FLOUT(2) ) CALL W3IOPP ( NPT, XPT, YPT, PNAMES, IMOD )
+#ifdef W3_MPI    
+    IF ( FLOUT(2) ) CALL W3IOPP ( NPT, XPT, YPT, PNAMES, IMOD, MPI_COMM_WAVE )
+#else 
+    IF ( FLOUT(2) ) CALL W3IOPP ( NPT, XPT, YPT, PNAMES, IMOD, 1 )
+#endif 
 #ifdef W3_PDLIB
     CALL DEALLOCATE_PDLIB_GLOBAL(IMOD)
 #endif