update to WW3 dev/unified_0.0.12

COSIMA · Dec 20, 2024 · 444975a · 444975a
1 parent 550e745
commit 444975a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/WW3/CMakeLists.txt b/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
 

diff --git a/WW3/WW3 b/WW3/WW3
diff --git a/WW3/patches/w3srcemd.F90.patch b/WW3/patches/w3srcemd.F90.patch
@@ -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
+8 −10		.github/workflows/gnu.yml
+27 −20		.github/workflows/intel.yml
+2 −1		model/ci/spack_gnu.yaml
+6 −5		model/ci/spack_intel.yaml
+63 −25		model/inp/ww3_grid.inp
+1 −1		model/inp/ww3_ounf.inp
+4 −3		model/inp/ww3_shel.inp
+4 −4		model/src/CMakeLists.txt
+1 −0		model/src/cmake/src_list.cmake
+15 −3		model/src/w3fld1md.F90
+7 −7		model/src/w3iogomd.F90
+15 −5		model/src/w3iorsmd.F90
+1 −1		model/src/w3odatmd.F90
+27 −2		model/src/w3ounfmetamd.F90
+2 −2		model/src/w3profsmd.F90
+2 −2		model/src/w3profsmd_pdlib.F90
+4 −3		model/src/w3sic4md.F90
+30 −1		model/src/w3src4md.F90
+247 −267		model/src/w3srcemd.F90
+8 −1		model/src/w3wavemd.F90
+41 −5		model/src/wav_comp_nuopc.F90
+6 −0		model/src/wav_import_export.F90
+2 −8		model/src/wav_shel_inp.F90
+119 −0		model/src/wav_wrapper_mod.F90
+18 −1		model/src/ww3_ounf.F90
+1 −1		model/src/ww3_ounp.F90
+52 −1		model/src/ww3_outf.F90
+8 −5		model/src/ww3_prnc.F90
+1 −65		model/src/ww3_shel.F90
+121 −110		regtests/bin/matrix.base
+23 −8		regtests/bin/matrix.comp
+7 −6		regtests/bin/matrix_cmake_datarmor
+9 −8		regtests/bin/matrix_cmake_milhydro
+2 −1		regtests/bin/matrix_cmake_ncep
+6 −5		regtests/bin/matrix_cmake_ukmo_cray
+58 −0		regtests/ww3_tp2.22/info
+1 −0		regtests/ww3_tp2.22/input/switch
+6 −0		regtests/ww3_tp2.22/input/track_i.ww3
+33 −0		regtests/ww3_tp2.22/input/ww3_grid.inp
+33 −0		regtests/ww3_tp2.22/input/ww3_grid_sdtail.inp
+43 −0		regtests/ww3_tp2.22/input/ww3_ounf.inp
+119 −0		regtests/ww3_tp2.22/input/ww3_ounp.inp
+10 −0		regtests/ww3_tp2.22/input/ww3_outf.inp
+11 −0		regtests/ww3_tp2.22/input/ww3_outp_spec.inp
+10 −0		regtests/ww3_tp2.22/input/ww3_outp_tab51.inp
+10 −0		regtests/ww3_tp2.22/input/ww3_outp_tab52.inp
+10 −0		regtests/ww3_tp2.22/input/ww3_outp_tab53.inp
+42 −0		regtests/ww3_tp2.22/input/ww3_shel.inp
+5 −0		regtests/ww3_tp2.22/input/ww3_strt.inp