fsd2

cicecore/cicedynB/general/ice_forcing.F90

@@ -5157,24 +5157,22 @@ subroutine get_wave_spec
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
          file=__FILE__, line=__LINE__)
 
+      ! if no wave data is provided, wave_spectrum is zero everywhere
       wave_spectrum(:,:,:,:) = c0
       wave_spec_dir = ocn_data_dir
       dbug = .false.
 
       ! wave spectrum and frequencies
       if (wave_spec) then
       ! get hardwired frequency bin info and a dummy wave spectrum profile
+      ! the latter is used if wave_spec_type == profile
          call icepack_init_wave(nfreq,                 &
                                 wave_spectrum_profile, &
                                 wavefreq, dwavefreq)
 
-         ! default, for testing only
-         do k = 1, nfreq
-            wave_spectrum(:,:,k,:) = wave_spectrum_profile(k)
-         enddo
 
          ! read more realistic data from a file
-         if (trim(wave_spec_type) == 'file') then
+         if ((trim(wave_spec_type) == 'constant').OR.(trim(wave_spec_type) == 'random')) then
          if (trim(wave_spec_file(1:4)) == 'unkn') then
             call abort_ice (subname//'ERROR: wave_spec_file '//trim(wave_spec_file))
          else

configuration/scripts/options/set_nml.fsd12

@@ -1,6 +1,6 @@
 tr_fsd = .true.
 nfsd = 12
-wave_spec_type = 'constant'
+wave_spec_type = 'profile'
 nfreq = 25
 ocn_data_format = 'nc'
 wave_spec_file  = 'unknown_wave_spec_file'

configuration/scripts/options/set_nml.fsd12ww3

@@ -1,6 +1,6 @@
 tr_fsd = .true.
 nfsd = 12
-wave_spec_type = 'file'
+wave_spec_type = 'constant'
 nfreq = 25
 ocn_data_format = 'nc'
 wave_spec_file  = 'ww3.20100101_efreq_remapgx3.nc'

doc/source/master_list.bib

@@ -928,6 +928,17 @@ @Article{Roberts18
   volume = {376},
   url = {http://dx.doi.org/10.1098/rsta.2017.0344}
 }
+
+@article{Roach19,
+author = "L.A. Roach and C. M. Bitz and C. Horvat and S. M. Dean",
+title = {{Advances in modelling interactions between sea ice and ocean surface waves}},
+journal = {Journal of Advances in Modeling Earth Systems},
+url = {http://doi.wiley.com/10.1029/2019MS001836},
+year={2019}
+}
+
+
+=======
 @article{Horvat15,
    author = "C. Horvat and E. Tziperman",
    journal = {The Cryosphere},

doc/source/user_guide/ug_case_settings.rst

@@ -337,9 +337,9 @@ Table of namelist options
    "","", "false", "release (topo) pond water immediately to ocean", ""
    "\*","``oceanmixed_ice``", "true/false", "active ocean mixed layer calculation", "``.true.`` (if uncoupled)"
    "\*", "``wave_spec_type``", "``none``", "no wave data provided, no wave-ice interactions", ""
-   "", "", "``constant``", "constant wave spectrum, for testing", ""
-   "", "", "``random``", "wave spectrum generated using random number", ""
-   "", "", "``file``", "wave spectrum read from ``wave_spec_file``", ""
+   "", "", "``profile``", "no wave data file is provided, use fixed dummy wave spectrum, for testing", ""
+   "", "", "``constant``", "wave data file is provided, constant wave spectrum, for testing", ""
+   "", "", "``random``", "wave data file is provided, wave spectrum generated using random number", ""
    "\*","``restore_ocn``", "true/false", "restore sst to data", ""
    "\*","``trestore``", "integer", "sst restoring time scale (days)", ""
    "","``restore_ice``", "true/false", "restore ice state along lateral boundaries", ""