Master: Updates from namelist branch

    -namelist for ww3_prnc coded and compiled
    -namelist feature for ww3_prnc validated

Change-Id: Ie12a89eda796ced48fb7a7345050d8786adbfcc8

Former-commit-id: d98ba8d7b0c9a564eae6a735ffb931c64e34533c

.gitignore

@@ -59,3 +59,18 @@ regtests/ww3_tp2.14/input*/*/*.nc.OAS*CM
 */*.pdf
 */*/*.pdf
 */*/*/*.pdf
+*~
+model/bin/comp
+model/bin/link
+model/bin/switch
+model/bin/switch.old
+model/bin/switch.old_DIST
+model/bin/switch.old_SHRD
+model/bin/switch.old_HYB
+model/bin/switch.old_OMP
+model/bin/w3adc
+model/bin/w3list
+model/bin/w3prnt
+model/bin/w3split
+model/wwatch3.env
+

model/bin/make_makefile.sh

@@ -858,7 +858,7 @@
                prop=
              source="w3triamd $stx $nlx $btx $is"
                  IO="w3iogrmd $couplmd $agcmmd $ogcmmd $igcmmd"
-                aux="constants w3servmd w3timemd w3arrymd w3dispmd w3gsrumd $tidecode" ;;
+                aux="constants w3servmd w3timemd w3arrymd w3dispmd w3gsrumd $tidecode w3nmlprncmd" ;;
      ww3_prtide) IDstring='Tide prediction'
                core='w3fldsmd'
                data='w3gdatmd w3adatmd w3idatmd w3odatmd'
@@ -874,7 +874,7 @@
                  IO="w3iogrmd w3iogomd w3iopomd w3iotrmd w3iorsmd w3iobcmd $couplmd $agcmmd $ogcmmd $igcmmd"
                  IO="$IO w3iosfmd w3partmd"
                 aux="constants w3servmd w3timemd $tidecode w3arrymd w3dispmd w3cspcmd w3gsrumd $cplcode"
-                aux="$aux w3namlmd" ;;
+                aux="$aux" ;;
     ww3_multi|ww3_multi_esmf)
                if [ "$prog" = "ww3_multi" ]
                then
@@ -892,7 +892,7 @@
                  IO='w3iogrmd w3iogomd w3iopomd wmiopomd'
                  IO="$IO w3iotrmd w3iorsmd w3iobcmd w3iosfmd w3partmd $couplmd $agcmmd $ogcmmd $igcmmd"
                 aux="constants $tidecode w3servmd w3timemd w3arrymd w3dispmd w3cspcmd w3gsrumd $mprfaux"
-                aux="$aux  wmunitmd w3namlmd" 
+                aux="$aux  wmunitmd w3nmlmultimd" 
                 if [ "$scrip" = 'SCRIP' ]
                 then
                   aux="$aux scrip_constants scrip_grids scrip_iounitsmod"
@@ -912,7 +912,7 @@
                  IO='w3iogrmd w3iogomd w3iopomd wmiopomd' 
                  IO="$IO w3iotrmd w3iorsmd w3iobcmd w3iosfmd w3partmd $couplmd $agcmmd $ogcmmd $igcmmd" 
                 aux="constants w3servmd w3timemd w3arrymd w3dispmd w3cspcmd w3gsrumd $mprfaux $tidecode" 
-                aux="$aux  wmunitmd w3namlmd"  
+                aux="$aux  wmunitmd w3nmlmultimd"  
                 if [ "$scrip" = 'SCRIP' ]
                 then
                   aux="$aux scrip_constants scrip_grids scrip_iounitsmod"
@@ -930,15 +930,15 @@
              source="$stx $nlx $btx $is"
                  IO='w3iogrmd w3iogomd'
                 aux='constants w3servmd w3timemd w3arrymd w3dispmd w3gsrumd'
-                aux="$aux w3namlmd" ;;
+                aux="$aux" ;;
      ww3_ounf) IDstring='Gridded NetCDF output'
                core='w3initmd'
                data='wmmdatmd w3gdatmd w3wdatmd w3adatmd w3idatmd w3odatmd'
                prop=
              source="w3triamd $stx $nlx $btx  $is"
                  IO='w3iogrmd w3iogomd w3iorsmd w3iopomd'
                 aux='constants w3servmd w3timemd w3arrymd w3dispmd w3gsrumd'
-                aux="$aux w3namlmd" ;;
+                aux="$aux" ;;
      ww3_outp) IDstring='Point output'
                core=
                data='w3triamd w3gdatmd w3wdatmd w3adatmd w3idatmd w3odatmd'
@@ -974,7 +974,7 @@
              source="$stx $nlx $btx $is"
                  IO='w3iogrmd w3iogomd'
                 aux='constants w3servmd w3timemd w3arrymd w3dispmd w3gsrumd'
-                aux="$aux w3namlmd" ;;
+                aux="$aux" ;;
      ww3_gspl) IDstring='Grid splitting'
                core='w3fldsmd'
                data='w3gdatmd w3wdatmd w3adatmd w3idatmd w3odatmd'
@@ -989,15 +989,15 @@
                prop=
              source="$st $nl $is"
                 aux='constants w3triamd w3servmd  w3arrymd w3dispmd w3timemd w3gsrumd'
-                aux="$aux w3namlmd" ;;
+                aux="$aux" ;;
       gx_outf) IDstring='GrADS input file generation (gridded fields)'
                core=
                data='wmmdatmd w3gdatmd w3wdatmd w3adatmd w3idatmd w3odatmd'
                prop=
              source="w3triamd $stx $nlx $btx $db $tr $bs $xx $is"
                  IO='w3iogrmd w3iogomd'
                 aux='constants w3servmd w3timemd w3arrymd w3dispmd w3gsrumd'
-                aux="$aux w3namlmd" ;;
+                aux="$aux" ;;
       gx_outp) IDstring='GrADS input file generation for point output'
                core=
                data='w3triamd w3gdatmd w3wdatmd w3adatmd w3idatmd w3odatmd'
@@ -1026,7 +1026,7 @@
                  source="$stx $nlx $btx $is" 
                  IO='w3iogrmd w3iogomd w3iorsmd' 
                  aux='constants w3servmd w3timemd w3arrymd w3dispmd w3gsrumd' 
-                 aux="$aux w3namlmd" ;; 
+                 aux="$aux" ;; 
     esac
 
     # if esmf is included in program name, then
@@ -1179,10 +1179,11 @@
                W3SIC1MD W3SIC2MD W3SIC3MD W3SIC4MD W3SIS1MD W3SIS2MD \
                W3REF1MD \
                W3SXXXMD \
-              CONSTANTS W3SERVMD W3TIMEMD W3ARRYMD W3DISPMD W3GSRUMD W3TRIAMD \
+               CONSTANTS W3SERVMD W3TIMEMD W3ARRYMD W3DISPMD W3GSRUMD W3TRIAMD \
                WMINITMD WMWAVEMD WMFINLMD WMMDATMD WMGRIDMD WMUPDTMD \
                WMUNITMD WMINIOMD WMIOPOMD WMSCRPMD WMESMFMD \
-               w3getmem WW_cc CMP_COMM W3OACPMD W3AGCMMD W3OGCMMD W3IGCMMD  W3NAMLMD
+               w3getmem WW_cc CMP_COMM W3OACPMD W3AGCMMD W3OGCMMD W3IGCMMD \
+               W3NMLMULTIMD W3NMLPRNCMD
       do
       case $mod in
          'W3INITMD'     ) modtest=w3initmd.o ;;
@@ -1289,7 +1290,8 @@
          'W3AGCMMD'     ) modtest=w3agcmmd.o ;;
          'W3OGCMMD'     ) modtest=w3ogcmmd.o ;;
          'W3IGCMMD'     ) modtest=w3igcmmd.o ;;
-         'W3NAMLMD'     ) modtest=w3namlmd.o ;;
+         'W3NMLMULTIMD' ) modtest=w3nmlmultimd.o ;;
+         'W3NMLPRNCMD' ) modtest=w3nmlprncmd.o ;;
       esac
       nr=`grep $mod check_file | wc -c | awk '{ print $1 }'`
       if [ "$nr" -gt '8' ]

model/ftn/w3iogomd.ftn

@@ -772,7 +772,6 @@
       USE W3ODATMD, ONLY: NOGRP, NGRPP, NOGE, IDOUT
       USE W3SERVMD, ONLY: STRSPLIT, STR_TO_UPPER
       USE W3GDATMD, ONLY: US3DF, USSPF
-      USE W3NAMLMD 
 !/S      USE W3SERVMD, ONLY: STRACE
 !
       IMPLICIT NONE
@@ -792,10 +791,6 @@
       INTEGER             :: I, IFI, IFJ, IOUT
 !/S      INTEGER, SAVE           :: IENT = 0
       LOGICAL             :: FLT
-
-      type(output_type_t) :: output_type
-
-
 !/
 !/ ------------------------------------------------------------------- /
 !/

model/ftn/w3iogrmd.ftn

@@ -1246,8 +1246,8 @@
 !/T              '      GTYPE  : ',I9/                                &
 !/T              '      FLAGLL : ',L9/                                &
 !/T              '      ICLOSE : ',I9/                                &
-!/T              '      SX, SY : ',2F12.2/                            &
-!/T              '      X0, Y0 : ',2F12.2/                            &
+!/T              '      SX, SY : ',2E10.3/                            &
+!/T              '      X0, Y0 : ',2E10.3/                            &
 !/T              '      TRFLAG : ',I9)
 !/T 9011 FORMAT ('      LOWER LEFT PART OF ',A)
 !/T 9012 FORMAT ('     ',4X,30I2)