Update WW3.

binli2337 · Nov 25, 2024 · c3ca0b8 · c3ca0b8
1 parent 0d16f06
commit c3ca0b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -6,8 +6,10 @@
   branch = feature/ocean_wave20241026
 [submodule "WW3"]
   path = WW3
-  url = https://github.com/NOAA-EMC/WW3
-  branch = dev/ufs-weather-model
+  #url = https://github.com/NOAA-EMC/WW3
+  #branch = dev/ufs-weather-model
+  url = https://github.com/binli2337/WW3
+  branch = update_z0
 [submodule "stochastic_physics"]
   path = stochastic_physics
   url = https://github.com/NOAA-PSL/stochastic_physics

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -220,7 +220,9 @@ if(WW3)
     if(PDLIB)
       set(SWITCH "meshcap_pdlib" CACHE STRING "NUOPC mesh cap")
     else()
-      set(SWITCH "meshcap" CACHE STRING "NUOPC mesh cap")
+      set(SWITCH "meshcap_new_z0" CACHE STRING "NUOPC mesh cap")
+#    else()
+#set(SWITCH "meshcap" CACHE STRING "NUOPC mesh cap")
     endif()
     set(UFS_CAP "NUOPC_MESH" CACHE STRING "Build with NUOPC_MESH cap")
     list(APPEND _ufs_defs_private FRONT_WW3=wav_comp_nuopc)

diff --git a/WW3 b/WW3
+3 −1		model/bin/build_utils.sh
+1 −0		model/bin/make_makefile.sh
+1 −0		model/bin/switch_meshcap_new_z0
+4 −5		model/src/CMakeLists.txt
+3 −2		model/src/cmake/src_list.cmake
+4 −0		model/src/cmake/switches.json
+1 −0		model/src/w3fld1md.F90
+707 −0		model/src/w3fld3md.F90
+14 −0		model/src/w3gdatmd.F90
+31 −3		model/src/w3gridmd.F90
+103 −62		model/src/w3initmd.F90
+9 −34		model/src/w3iogomd.F90
+0 −538		model/src/w3iogoncdmd.F90
+8 −0		model/src/w3iogrmd.F90
+14 −66		model/src/w3iorsmd.F90
+30 −18		model/src/w3odatmd.F90
+16 −0		model/src/w3srcemd.F90
+62 −23		model/src/w3triamd.F90
+169 −183		model/src/w3wavemd.F90
+231 −157		model/src/wav_comp_nuopc.F90
+0 −295		model/src/wav_grdout.F90
+914 −0		model/src/wav_history_mod.F90
+420 −0		model/src/wav_pio_mod.F90
+538 −0		model/src/wav_restart_mod.F90
+31 −18		model/src/wav_shel_inp.F90
+6 −0		model/src/wav_shr_flags.F90
+23 −0		model/src/wav_shr_mod.F90
+1 −1		model/src/wmwavemd.F90