update to WW3 dev/unified_0.0.12

Author: anton-seaice

WW3/CMakeLists.txt

@@ -44,6 +44,7 @@ target_sources(OM3_ww3 PRIVATE
   WW3/model/src/w3iogomd.F90
   WW3/model/src/w3iogrmd.F90
   WW3/model/src/w3iopomd.F90
+  WW3/model/src/w3iorsmd.F90
   WW3/model/src/w3iosfmd.F90
   WW3/model/src/w3iotrmd.F90
   WW3/model/src/w3macros.h
@@ -62,7 +63,6 @@ target_sources(OM3_ww3 PRIVATE
   WW3/model/src/w3parall.F90
   WW3/model/src/w3partmd.F90
   WW3/model/src/w3servmd.F90
-  WW3/model/src/w3srcemd.F90
   WW3/model/src/w3strkmd.F90
   WW3/model/src/w3timemd.F90
   WW3/model/src/w3triamd.F90
@@ -83,17 +83,18 @@ target_sources(OM3_ww3 PRIVATE
   WW3/model/src/wav_grdout.F90
   WW3/model/src/w3iogoncdmd.F90
   WW3/model/src/wav_shr_flags.F90
-
+  
   WW3/model/src/wav_kind_mod.F90
   WW3/model/src/wav_shr_mod.F90
   WW3/model/src/wav_shel_inp.F90
   WW3/model/src/wav_comp_nuopc.F90
   WW3/model/src/wav_import_export.F90
+  WW3/model/src/wav_wrapper_mod.F90
 
   ${switch_files}
 )
 
-add_patched_source(OM3_ww3 WW3/model/src/w3iorsmd.F90)
+add_patched_source(OM3_ww3 WW3/model/src/w3srcemd.F90)
 
 ## Utilities
 

WW3/WW3

@@ -0,0 +1,22 @@
+diff --git a/model/src/w3srcemd.F90 b/model/src/w3srcemd.F90
+index 9bd97c6f..c51a8609 100644
+--- a/model/src/w3srcemd.F90
++++ b/model/src/w3srcemd.F90
+@@ -2088,7 +2088,7 @@ CONTAINS
+ #ifdef W3_IC3
+       CALL W3SIC3 ( SPEC,DEPTH, CG1,  WN1, IX, IY, VSIC, VDIC )
+ #endif
+-#ifndef W3_IC4_NUMERICS
++#if defined(W3_IC4) && !defined(W3_IC4_NUMERICS)
+       CALL W3SIC4 ( SPEC,DEPTH, CG1,       IX, IY, VSIC, VDIC )
+ #endif
+ #ifdef W3_IC5
+@@ -2119,7 +2119,7 @@ CONTAINS
+ #ifdef W3_IC3
+         ATT=EXP(ICE*VDIC(IS)*DTG)
+ #endif
+-#ifndef W3_IC4_NUMERICS
++#if defined(W3_IC4) && !defined(W3_IC4_NUMERICS)
+        ATT=EXP(ICE*VDIC(IS)*DTG)
+ #endif
+ #ifdef W3_IC5