Skip to content

+Move wave module variables into control structure#1404

Merged
marshallward merged 7 commits into
mom-ocean:dev/gfdlfrom
Hallberg-NOAA:MOM_wave_control
May 26, 2021
Merged

+Move wave module variables into control structure#1404
marshallward merged 7 commits into
mom-ocean:dev/gfdlfrom
Hallberg-NOAA:MOM_wave_control

Conversation

@Hallberg-NOAA
Copy link
Copy Markdown
Collaborator

Moved 15 module variables into wave_parameters_CS, to follow the coding style
and conventions in the rest of the code. Also added comments describing 8
enumeration parameters in this same module, and added comments suggesting ways
that the accuracy of the calculations could be improved. Also incorporated a
factor of 2*PI into the definition of Freq_Cen in this module. In addition, the
initialization procedure for this module was altered in some more commonly used
cases, so that use MOM_wave_interface_init to set wave parameters, even with a
statistical wave model, and eliminated MOM_wave_interface_init_lite. I believe
that all solutions should be bitwise identical, but this module is not yet well
tested in the MOM6 regression tests. The commits in this PR include:

  Moved 15 module variables into wave_parameters_CS, to follow the coding style
and conventions in the rest of the code.  Also added comments describing 8
enumeration parameters in this same module, and added comments suggesting ways
that the accuracy of the calculations could be improved.  Also incorporated a
factor of 2*PI into the definition of Freq_Cen in this module.  In addition, the
initialization procedure for this module was altered in some more commonly used
cases, so that use MOM_wave_interface_init to set wave parameters, even with a
statistical wave model, and eliminated MOM_wave_interface_init_lite.  I believe
that all solutions should be bitwise identical, but this module is not yet well
tested in the MOM6 regression tests.
@Hallberg-NOAA Hallberg-NOAA requested a review from breichl May 19, 2021 14:11
Copy link
Copy Markdown
Collaborator

@breichl breichl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @Hallberg-NOAA, these look like good changes and improvements to the code. As you point out, the testing is not presently sufficient and this will be addressed soon, but I've checked some cases offline and it looks to not change any functionality. I approve. I made just a couple of minor comments on comments, but nothing that actually changes the code.

Comment thread config_src/drivers/FMS_cap/ocean_model_MOM.F90 Outdated
Comment thread config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
Comment thread src/user/MOM_wave_interface.F90 Outdated
Comment thread src/user/MOM_wave_interface.F90
  Corrected typos in comments, and removed unnecessary commented out code as
noted by Brandon Reichl in his review of MOM6 dev/gfdl PR# 1404.  All answers
are bitwise identical.
@Hallberg-NOAA
Copy link
Copy Markdown
Collaborator Author

Brandon Reichl has approved these changes. He will be following this up with further changes to eliminate some of the redundant options.

@marshallward
Copy link
Copy Markdown
Collaborator

marshallward commented May 26, 2021

Copy link
Copy Markdown
Collaborator

@marshallward marshallward left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving on behalf of @breichl

@marshallward marshallward merged commit 3a494bb into mom-ocean:dev/gfdl May 26, 2021
@Hallberg-NOAA Hallberg-NOAA deleted the MOM_wave_control branch July 30, 2021 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants