Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge wave ice coupling into up-to date branch (as of Oct 4) #2

Merged
merged 90 commits into from
Oct 4, 2023

Commits on Aug 9, 2023

  1. updated .gitmodules to point ww3 and icepack to erinthomas github dir…

    …ectory
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    44d27c3 View commit details
    Browse the repository at this point in the history
  2. initial modificaiton for wave ice coupling:

    added definitions of _w2x_ _x2w_ _i2x_ and _x2i_ for wave-ice coupling
    modification currenlty commented out until ready for testing)
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    7c241cf View commit details
    Browse the repository at this point in the history
  3. Added ice floe size to ix2 and x2w vars

    added wave spectrum to w2x and x2i vars
    (note- variable commented out for now and array have not been filled with data)
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    1966acc View commit details
    Browse the repository at this point in the history
  4. added options to allow wave coupling with MPASSi (as a command line c…

    …ompile option)
    
    also updated the column_waveFracture within mpas_seaice_icepack.F (still in progress)
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    13569e9 View commit details
    Browse the repository at this point in the history
  5. Modifications to namelist setup - to allow wave-ice coupling and defi…

    …ne the number of wave frequencies (which is set in Wave model)
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    e04f341 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    58fc0cf View commit details
    Browse the repository at this point in the history
  7. varibles for wave coupling added to sea ice registry (icefloe size, w…

    …ave spectrum)
    
    constants defined by WW3 needed by mpassi defined in seq_infordata_mod
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    7c25ca5 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    e249c4f View commit details
    Browse the repository at this point in the history
  9. commenting out mods to test.

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a58c67f View commit details
    Browse the repository at this point in the history
  10. commenting out for testing

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    e3c9d3e View commit details
    Browse the repository at this point in the history
  11. correct compset name for DTEST- with WW3

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    19c5983 View commit details
    Browse the repository at this point in the history
  12. adding init_column_fsd subroutine to mpas_seaice_icepack.F and starti…

    …ng to include FSD variables to Registry.
    
    Also changed flag name for wave-ice stuff to "config_use_column_waves"
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    1158f77 View commit details
    Browse the repository at this point in the history
  13. declare config_use_column_waves type

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    fb9376b View commit details
    Browse the repository at this point in the history
  14. several typos fixed in new fsd init subroutine.

    Code compiles correctly now.
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    326cfca View commit details
    Browse the repository at this point in the history
  15. add fsd flag to column tracers

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    6f357ea View commit details
    Browse the repository at this point in the history
  16. typo fix

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    2eec03b View commit details
    Browse the repository at this point in the history
  17. added call to icepack_init_fsd. compile correctly

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    aa4384d View commit details
    Browse the repository at this point in the history
  18. add vars for FSD to registry

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    7d645c1 View commit details
    Browse the repository at this point in the history
  19. starting to add fsd tracer variable infrastructure

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a013ac8 View commit details
    Browse the repository at this point in the history
  20. bug fixes to fsd tracer code

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    79c8807 View commit details
    Browse the repository at this point in the history
  21. bugs/typo fixes in fsd tracer codes

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    5f03f2e View commit details
    Browse the repository at this point in the history
  22. bug fixes/typos in tracer code

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    62c1ede View commit details
    Browse the repository at this point in the history
  23. typo fixes on tracer code

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    b228b12 View commit details
    Browse the repository at this point in the history
  24. update fsd tracer code, and init_fsd

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    c365945 View commit details
    Browse the repository at this point in the history
  25. update fsd initalization to better match CICE code.

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    77e8b33 View commit details
    Browse the repository at this point in the history
  26. final bug fixes to icepack init_fsd

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    6224c1b View commit details
    Browse the repository at this point in the history
  27. updates to icepacks initalization for fsd

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    310b8cb View commit details
    Browse the repository at this point in the history
  28. minor corrections to match variable names in registry.

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    76974b2 View commit details
    Browse the repository at this point in the history
  29. a few minor fixes(such as typos and white spaces)

    fix to floeSizeDist time dimension in initalization subroutine.
    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    9bca199 View commit details
    Browse the repository at this point in the history
  30. git rebase

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    756d27d View commit details
    Browse the repository at this point in the history
  31. removing extra empy spaces

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    403c6f1 View commit details
    Browse the repository at this point in the history
  32. infrastructure to wave - ice coupling. for example: adding fsd and wa…

    …vespectra to seq_flds_mod.F90
    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    c8ae7d2 View commit details
    Browse the repository at this point in the history
  33. Define w2x_Sw_wavespec in ww3_cpl_indices.f90

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    46ab0b3 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    bcfd084 View commit details
    Browse the repository at this point in the history
  35. index_w2x_Sw_wavespec is now a function of frequency - should create …

    …individual
    
    coupling variable for wave spectrum for every frequency
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    e5a228d View commit details
    Browse the repository at this point in the history
  36. fixing typos in ice_comp_mct for wave coupling variables and ensuring…

    … consistency with structure/variables within Registry.xml
    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    b21c544 View commit details
    Browse the repository at this point in the history
  37. smll typo fix to wav_comp_mct

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    5444ba3 View commit details
    Browse the repository at this point in the history
  38. fix loop to define Sw_wavespec for each freq value in wav_comp_mct.F90

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    6ce9071 View commit details
    Browse the repository at this point in the history
  39. add EF to coupling and output namelist for WW3

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    df0c5f7 View commit details
    Browse the repository at this point in the history
  40. typo fix

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    cf269c8 View commit details
    Browse the repository at this point in the history
  41. rename WaveSpectrum to 'WaveSpectra'

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    10bee16 View commit details
    Browse the repository at this point in the history
  42. add number of wave frequencies to drv_in namelist - cime requires the

    number of wave frequencies used in order to define/initalize
    the coupled wave spectrum variables (wave psctrum is a coupled 3D variable)
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    767b5e5 View commit details
    Browse the repository at this point in the history
  43. remove empty spaces from prior commit

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    e662d34 View commit details
    Browse the repository at this point in the history
  44. Configuration menu
    Copy the full SHA
    6f54248 View commit details
    Browse the repository at this point in the history
  45. full coupling of 3D wave spectra. (note code compiles but has not bee…

    …n tested at this point)
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    13e3295 View commit details
    Browse the repository at this point in the history
  46. FSD and Wave Ice coupling code complet + runs.

    Note - accuracy of new code has not been completed yet.
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    ab03796 View commit details
    Browse the repository at this point in the history
  47. Configuration menu
    Copy the full SHA
    d2c6e82 View commit details
    Browse the repository at this point in the history
  48. typo correction

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    26281bc View commit details
    Browse the repository at this point in the history
  49. fix n-D aray for wave spectra in MPASSI

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    eb335bc View commit details
    Browse the repository at this point in the history
  50. bug fix to wave spectra definition in mpassi

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    5dc971f View commit details
    Browse the repository at this point in the history
  51. typo fix

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    16a20b2 View commit details
    Browse the repository at this point in the history
  52. fix to wavespectra in ice comp_mct definition

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    3aee066 View commit details
    Browse the repository at this point in the history
  53. adding wave vars to daily and monthly output by dafault (mpas-seaice/…

    …cime_config/buildnml)
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    d68265f View commit details
    Browse the repository at this point in the history
  54. fix to ice_ic definition in initialization of FSD.

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    28f9229 View commit details
    Browse the repository at this point in the history
  55. rebase icepack_step_therm2 call

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    1961863 View commit details
    Browse the repository at this point in the history
  56. add nBioTracersLayer to steptherm2, comment out optional arguments fo…

    …r isotopes
    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    dfd9a76 View commit details
    Browse the repository at this point in the history
  57. comment about CICE vs MPASSI use of Significant wave height

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    b7a2859 View commit details
    Browse the repository at this point in the history
  58. minor syntax fix

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    9d8ff22 View commit details
    Browse the repository at this point in the history
  59. wave coupling definition

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    311ba14 View commit details
    Browse the repository at this point in the history
  60. define lateralHeatFlux Type

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    3ad9bd5 View commit details
    Browse the repository at this point in the history
  61. define lateralIceMeltRate

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    25ed277 View commit details
    Browse the repository at this point in the history
  62. point to original icepack branch

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    427ca7b View commit details
    Browse the repository at this point in the history
  63. update a few wave vars

    Erin Thomas authored and Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    d3cd21b View commit details
    Browse the repository at this point in the history
  64. bug fix to define wave spectra as zero in driver-mct namelist when WW…

    …3 is not used
    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    70acc17 View commit details
    Browse the repository at this point in the history
  65. bug fix to wavefracture call- only if wave turned on.

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    12d004d View commit details
    Browse the repository at this point in the history
  66. minor formatting updates

    Erin Thomas committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    2e729f5 View commit details
    Browse the repository at this point in the history
  67. Configuration menu
    Copy the full SHA
    dd9965b View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. bug fix to frequency calculation

    Erin Thomas committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    02b5c02 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c9ca281 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. adding wave_spec_type to config options (set to 'random' if ww3 is co…

    …upled,
    
     and 'none' if ww3 is not used)
    Erin Thomas committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    b1670d7 View commit details
    Browse the repository at this point in the history
  2. add config_wave_spec_type to Registery.xml

    Erin Thomas committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    ed3e147 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Configuration menu
    Copy the full SHA
    ba3170b View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. update fsd related parameters in step therm 1 call

    Erin Thomas committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    32bfe07 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. Configuration menu
    Copy the full SHA
    99b272f View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. call to ice_comp_init now includes wav_c2_ice argument

    Erin Thomas committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    fbbb254 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    44992f4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b091f6b View commit details
    Browse the repository at this point in the history
  4. define wave to ice remapping file for WQU225EC30to60

    Erin Thomas committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    072fe04 View commit details
    Browse the repository at this point in the history
  5. typo fix for wav2ice smap

    Erin Thomas committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    319b903 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. fix to wav_c2_ice variable for wave to ice coupling

    Erin Thomas committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    ef5a56c View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. remove print lines for testing

    Erin Thomas committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    e1fc825 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. add calculation for IceFloePerimeter per unit area

    Erin Thomas committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    750b123 View commit details
    Browse the repository at this point in the history
  2. move location of Hs - fixes issue with all zeros being passed from co…

    …upler to mpas-si
    Erin Thomas committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    facceff View commit details
    Browse the repository at this point in the history
  3. add FloeSizePerimeter to defult output streams

    Erin Thomas committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    900fd51 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f730f52 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. fix to step therm2 for floediam (only uses this namelist constant is …

    …FSD is off)
    Erin Thomas committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    9c49a2d View commit details
    Browse the repository at this point in the history
  2. fix to fsd perimeter calcualtion. - note the location of this calcula…

    …tion will be moved to more approprate location in near future.
    Erin Thomas committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    434cada View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. fix to typo of 'config_floediam'

    Erin Thomas committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    a9648db View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. add floesize analysis member.

    Erin Thomas committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    13e520f View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. Configuration menu
    Copy the full SHA
    5f7508d View commit details
    Browse the repository at this point in the history