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

Additions from GMAO (2): Add hooks to get melt_potential and OBLD #1253

Merged
merged 5 commits into from
Nov 24, 2020
Merged

Additions from GMAO (2): Add hooks to get melt_potential and OBLD #1253

merged 5 commits into from
Nov 24, 2020

Conversation

sanAkel
Copy link
Collaborator

@sanAkel sanAkel commented Nov 19, 2020

This PR includes addition of:

  • melt potential
  • ocean boundary layer depth (OBLD)

to variables that can obtained by ocean_model_data2D_get

@codecov-io
Copy link

codecov-io commented Nov 19, 2020

Codecov Report

Merging #1253 (a0b94f3) into dev/gfdl (131f0e3) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           dev/gfdl    #1253   +/-   ##
=========================================
  Coverage     46.03%   46.03%           
=========================================
  Files           224      224           
  Lines         70921    70921           
=========================================
  Hits          32648    32648           
  Misses        38273    38273           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 131f0e3...a0b94f3. Read the comment docs.

@@ -802,6 +806,8 @@ subroutine initialize_ocean_public_type(input_domain, Ocean_sfc, diag, maskmap,
Ocean_sfc%v_surf(:,:) = 0.0 ! time averaged v-current (m/sec) passed to atmosphere/ice models
Ocean_sfc%sea_lev(:,:) = 0.0 ! time averaged thickness of top model grid cell (m) plus patm/rho0/grav
Ocean_sfc%frazil(:,:) = 0.0 ! time accumulated frazil (J/m^2) passed to ice model
Ocean_sfc%melt_potential = 0.0 ! time accumulated melt potential (J/m^2) passed to ice model
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is an array syntax initialization statement. The MOM6 code style guide ( https://github.com/NOAA-GFDL/MOM6/wiki/Code-style-guide ) requires the addition of '(:,:)' to make it clear that this is this initialization of a 2-d array, so this line should become `Ocean_sfc%melt_potential(:,:) = 0.0 ! ...' , and similarly on the next line.

fixed the array initialization syntax
Copy link
Collaborator

@Hallberg-NOAA Hallberg-NOAA left a comment

Choose a reason for hiding this comment

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

These changes seem reasonable and properly implemented. I think that they are in line be merged into MOM6 after the TC and regression testing have passed.

@sanAkel
Copy link
Collaborator Author

sanAkel commented Nov 20, 2020

These changes seem reasonable and properly implemented. I think that they are in line be merged into MOM6 after the TC and regression testing have passed.

Thank you @Hallberg-NOAA , I was thinking of adding an optional arg to ocean_model_init as you suggested for the stress https://github.com/NOAA-GFDL/MOM6/blob/80a6df4a0e232756ea02b3c71c9b92786798c242/config_src/coupled_driver/ocean_model_MOM.F90#L237 via HFREEZE from our coupler https://github.com/GEOS-ESM/GEOSgcm_GridComp/blob/develop/GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/MOM6_GEOSPlug/MOM6_GEOSPlug.F90

But given the current status of our ice-ocean coupling (in GEOS) backed away! However, I am thinking how you handle these fields (melt_potential and OBLD) with SIS2. Will send an email to continue this conversation offline.

@marshallward marshallward self-assigned this Nov 23, 2020
@marshallward
Copy link
Collaborator

marshallward commented Nov 24, 2020

@marshallward marshallward merged commit be00c67 into mom-ocean:dev/gfdl Nov 24, 2020
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