Skip to content

Ocean/remove unused modules#569

Merged
mark-petersen merged 3 commits intoMPAS-Dev:ocean/developfrom
mark-petersen:ocean/remove_unused_modules
Jun 1, 2020
Merged

Ocean/remove unused modules#569
mark-petersen merged 3 commits intoMPAS-Dev:ocean/developfrom
mark-petersen:ocean/remove_unused_modules

Conversation

@mark-petersen
Copy link
Contributor

Removes these modules:

vmix
vmix_const
vmix_rich
vmix_tanh
hmix_del2_tensor
hmix_del4_tensor

The vmix modules are replaced by cvmix. Redundant code is poor practice and leads to errors. The hmix tensor routines were experimental. They caused noisy fields and were never used in the end.

All the COMPASS tests that used vmix_const were changed over to cvmix with constant background viscosity. The others were not used by COMPASS tests.

Fixes #557

@mark-petersen
Copy link
Contributor Author

passes nightly regression suite.

@mark-petersen
Copy link
Contributor Author

@vanroekel @pwolfram or @xylar
I might have a window to merge this in, if any of you could review soon. It is very simple, just removes the unused modules we had discussed. I ran the nightly regression suite, so I think visual inspection is sufficient.

Copy link
Contributor

@pwolfram pwolfram left a comment

Choose a reason for hiding this comment

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

Only substantive comment I have here-- why removal of the tensor operations? Only have a few minor comments / questions sprinkled throughout.

@pwolfram
Copy link
Contributor

@mark-petersen, did a quick visual inspection review with comments / questions above.

@xylar
Copy link
Collaborator

xylar commented May 29, 2020

why removal of the tensor operations?

This was discussed in these comments:
#557 (comment)
#557 (comment)

Copy link
Collaborator

@xylar xylar left a comment

Choose a reason for hiding this comment

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

Wow, @mark-petersen, this was quite an endeavor! Thanks for taking care of it. It will be very nice to have the code slimmed down this way.

I looked through the changes to test cases in particular and I think you've done a great job at making sure the new settings with CVMix only are the same as the old ones (where that's possible).

@pwolfram
Copy link
Contributor

@mark-petersen, cleaned up comments above-- only real issue left is potential concern over mixing used in SOMA, especially since @lizcarlson needs it for her work.

Copy link
Contributor

@vanroekel vanroekel left a comment

Choose a reason for hiding this comment

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

@mark-petersen this looks great. Nice work getting all the settings in order. Just a few questions about a few test cases, but this looks good.

@lizcarlson
Copy link

lizcarlson commented May 30, 2020 via email

@pwolfram
Copy link
Contributor

@lizcarlson, so very happy too hear-- thanks for confirming so we can move forward!

@pwolfram
Copy link
Contributor

@mark-petersen, as far as I can tell @xylar, @vanroekel, @lizcarlson and myself worked through all issues and you can merge now..

@pwolfram
Copy link
Contributor

pwolfram commented May 31, 2020

PS-- congrats on a -2k or so line PR, code will be better for it!

@mark-petersen mark-petersen merged commit fc22a80 into MPAS-Dev:ocean/develop Jun 1, 2020
mark-petersen added a commit that referenced this pull request Jun 1, 2020
Adds normalVelocity arrays to eddy products #544
Adds Ocean Heat Content AM #455
Ocean/remove unused modules #569
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Jun 2, 2020
Update mpas-source: analysis member update, remove unused modules

This PR brings in a new mpas-source submodule with changes only to the ocean,
including several updates to analysis members and removing modules that are not
used in E3SM simulations:
* Adds normalVelocity arrays to eddy products (MPAS-Dev/MPAS-Model#544)
* Adds Ocean Heat Content AM (MPAS-Dev/MPAS-Model#455)
* Ocean/remove unused modules (MPAS-Dev/MPAS-Model#569)
It includes corresponding changes to E3SM namelists and streams files for
MPAS-Ocean. COMPASS changes associated with these PRs are also included.

[NML]
[BFB]
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Jun 3, 2020
…3613)

Update mpas-source: analysis member update, remove unused modules

Re-merged after fixes for debug failures, excess output

This PR brings in a new mpas-source submodule with changes only to the ocean,
including several updates to analysis members and removing modules that are not
used in E3SM simulations:
* Adds normalVelocity arrays to eddy products (MPAS-Dev/MPAS-Model#544)
* Adds Ocean Heat Content AM (MPAS-Dev/MPAS-Model#455)
* Ocean/remove unused modules (MPAS-Dev/MPAS-Model#569)
It includes corresponding changes to E3SM namelists and streams files for
MPAS-Ocean. COMPASS changes associated with these PRs are also included.

[NML]
[BFB]
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Jun 4, 2020
Update mpas-source: analysis member update, remove unused modules

This PR brings in a new mpas-source submodule with changes only to the ocean,
including several updates to analysis members and removing modules that are not
used in E3SM simulations:
* Adds normalVelocity arrays to eddy products (MPAS-Dev/MPAS-Model#544)
* Adds Ocean Heat Content AM (MPAS-Dev/MPAS-Model#455)
* Ocean/remove unused modules (MPAS-Dev/MPAS-Model#569)
It includes corresponding changes to E3SM namelists and streams files for
MPAS-Ocean. COMPASS changes associated with these PRs are also included.

[NML]
[BFB]
@mark-petersen mark-petersen deleted the ocean/remove_unused_modules branch June 8, 2020 11:33
mark-petersen added a commit to mark-petersen/MPAS-Model that referenced this pull request Jan 11, 2021
Ocean/remove unused modules MPAS-Dev#569

Removes these modules:

vmix
vmix_const
vmix_rich
vmix_tanh
hmix_del2_tensor
hmix_del4_tensor

The vmix modules are replaced by cvmix. Redundant code is poor practice
and leads to errors. The hmix tensor routines were experimental. They
caused noisy fields and were never used in the end.

All the COMPASS tests that used vmix_const were changed over to cvmix
with constant background viscosity. The others were not used by COMPASS
tests.

Fixes MPAS-Dev#557
caozd999 pushed a commit to caozd999/MPAS-Model that referenced this pull request Jan 14, 2021
Ocean/remove unused modules MPAS-Dev#569

Removes these modules:

vmix
vmix_const
vmix_rich
vmix_tanh
hmix_del2_tensor
hmix_del4_tensor

The vmix modules are replaced by cvmix. Redundant code is poor practice
and leads to errors. The hmix tensor routines were experimental. They
caused noisy fields and were never used in the end.

All the COMPASS tests that used vmix_const were changed over to cvmix
with constant background viscosity. The others were not used by COMPASS
tests.

Fixes MPAS-Dev#557
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants