Skip to content

Update flux const#1427

Merged
Hallberg-NOAA merged 5 commits into
mom-ocean:dev/gfdlfrom
wfcooke:update_flux_const
Jun 24, 2021
Merged

Update flux const#1427
Hallberg-NOAA merged 5 commits into
mom-ocean:dev/gfdlfrom
wfcooke:update_flux_const

Conversation

@wfcooke
Copy link
Copy Markdown
Contributor

@wfcooke wfcooke commented Jun 15, 2021

Updating for addition of FLUX_CONST_SALT and FLUX_CONST_TEMP with clean history.
Unit_scaling has been added, but answers change for different values of T_RESCALE_POWER.

wfcooke and others added 3 commits June 14, 2021 17:12
Updating for addition of FLUX_CONST_SALT and FLUX_CONST_TEMP with clean history.
Unit_scaling has been added, but answers change for different values of T_RESCALE_POWER.
Reinstated check on allow_flux_adjustments and restore_temp before
allocating the heat_added and salt_flux_added arrays.
Initialized arrays within flag construct too.

Removed previous allocation of salt_flux_added.
Copy link
Copy Markdown
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.

This PR is failling with "invalid memory references" in the OM4_025 test case with the gnu compiler in the pipeline tests. Unfortunately the trace-back for these errors does not provide concrete information about where in the code the error is occurring (see
https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/jobs/65471 ), but if I had to guess, the conditional allocation of fluxes%salt_flux_added and fluxes%heat_flux_added would seem like the most likely suspect. Running with the intel compiler or with with an executable compiled for debugging might give more useful information.

Please correct these errors and verify that the OM4_025 test case runs properly with the updated code.

@MJHarrison-GFDL
Copy link
Copy Markdown
Contributor

Thanks @Hallberg-NOAA . @wfcooke , can you please remore my changes for the conditional allocation of these arrays, Sorry about the mixup.

wfcooke and others added 2 commits June 22, 2021 07:45
@Hallberg-NOAA
Copy link
Copy Markdown
Collaborator

After the update, this PR is now passing the pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/12946, but because it changes the contents of the MOM_parameter_doc files, it has to be merged manually.

@Hallberg-NOAA Hallberg-NOAA merged commit 1de087e into mom-ocean:dev/gfdl Jun 24, 2021
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.

3 participants