Bug fixes for thread in w3_new and initializing variables (NOAA-EMC#373)

* update w3_new for thread switches * adding files to .gitignore * fix formatting * initialize GA0, GAN, GD0, GDN for moving grids This appears to have been causing an issue in ww3_ts3 test cases when using OMP or MPI_OMPH that have not appeared before.
umr-lops · May 14, 2021 · 9708edc · 9708edc
1 parent 1d13cd5
commit 9708edc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -59,6 +59,9 @@ regtests/ww3_tp2.14/input/oasis3-mct/doc
 regtests/ww3_tp2.14/input*/*.nc.OAS*CM*
 regtests/ww3_tp2.14/input*/*/*.nc.OAS*CM*
 regtests/ww3_tp2.17/input/inlet.msh
+regtests/ww3_tp2.21/input/mesh.msh
+regtests/ww3_tp2.21/input/obstructions_local.glo_unst.in
+regtests/ww3_tp2.21/input/obstructions_shadow.glo_unst.in
 *.nc
 */*.nc
 */*/*.nc

diff --git a/model/bin/w3_new b/model/bin/w3_new
@@ -120,14 +120,27 @@
      'mpp'    );;
      'mpiexp' ) cd $main_dir/ftn ; touch wmgridmd.ftn ;;
      'thread' ) cd $main_dir/ftn ; touch w3wavemd.ftn
+                                   touch w3canomd.ftn
+                                   touch w3fld1md.ftn
+                                   touch w3fld2md.ftn
+                                   touch w3flxxmd.ftn
                                    touch w3iogomd.ftn
                                    touch w3pro1md.ftn
                                    touch w3pro2md.ftn
                                    touch w3pro3md.ftn
+                                   touch w3psmcmd.ftn
+                                   touch w3srcemd.ftn
+                                   touch w3pro1md.ftn
+                                   touch w3pro2md.ftn
+                                   touch w3pro3md.ftn
+                                   touch w3updtmd.ftn
+                                   touch wmgridmd.ftn
                                    touch w3uno2md.ftn
                                    touch w3updtmd.ftn
                                    touch w3uqckmd.ftn
-                                   touch w3iogomd.ftn ;;
+                                   touch w3iogomd.ftn 
+                                   touch ww3_multi.ftn
+                                   touch ww3_shel.ftn ;;
      'GSE'    ) cd $main_dir/ftn ; touch w3gdatmd.ftn
                                    touch w3adatmd.ftn
                                    touch w3idatmd.ftn

diff --git a/model/ftn/w3idatmd.ftn b/model/ftn/w3idatmd.ftn
@@ -300,6 +300,10 @@
         INPUTS(I)%TDN(2)   =  0
         INPUTS(I)%TG0(1)   = -1
         INPUTS(I)%TG0(2)   =  0
+        INPUTS(I)%GA0      = 0.
+        INPUTS(I)%GD0      = 0.
+        INPUTS(I)%GAN      = 0.
+        INPUTS(I)%GDN      = 0.
         INPUTS(I)%IINIT    = .FALSE.
         INPUTS(I)%INFLAGS1 = .FALSE.
         INPUTS(I)%INFLAGS2 = .FALSE.