Skip to content

Conversation

@xylar
Copy link
Collaborator

@xylar xylar commented Aug 21, 2020

As of #496, MPAS-Ocean no longer supports multiple blocks.

@xylar
Copy link
Collaborator Author

xylar commented Aug 21, 2020

I was testing #550 and found that these test cases don't work anymore.

@xylar xylar changed the title Remove QU240 RK4 block test Remove QU240 RK4 and SE block tests Aug 21, 2020
@mark-petersen mark-petersen force-pushed the ocean/remove_block_test branch from 997583f to fadacf8 Compare September 9, 2020 04:33
@mark-petersen
Copy link
Contributor

@xylar, the previous block tests also served as a test for different domain partitions. So I simply changed these two tests to function again with partitions (4 vs 8).

Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

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

Tested nightly regression suite with gnu on grizzly. Partition test with SE and RK4 work fine.

@mark-petersen
Copy link
Contributor

@xylar If you agree with this, I'll merge.

@mark-petersen mark-petersen changed the title Remove QU240 RK4 and SE block tests Change block tests to partition tests for QU240 RK4 and SE Sep 9, 2020
Copy link
Collaborator Author

@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.

I can't approve my own PR but I ran with the changes you made, @mark-petersen, and it works fine.

Probably a cleaner procedure in the future would be to just open a new PR, since this branch contains only changes that you made, is now incorrectly named, and I am not able to review it.

@xylar
Copy link
Collaborator Author

xylar commented Sep 9, 2020

I ran the two modified tests on my laptop with Gnu and they work as expected.

@mark-petersen
Copy link
Contributor

Yeah, looking back at this now, it would have been cleaner with two PRs. I'll keep that in mind on future ones.

@mark-petersen mark-petersen merged commit 3d53f22 into MPAS-Dev:ocean/develop Sep 9, 2020
mark-petersen added a commit that referenced this pull request Sep 9, 2020
New Mesh: EC30to60kmL60E3SMv2r02 and change to 60 layers as default #668
New mesh: EC30to60kmL60E3SMv2r03 and change to gebco bathymetry #669
Fix validation for QU240 test step #660
Change block tests to partition tests for QU240 RK4 and SE #657
Update to version 0.1.11 of the compass environment #688
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Sep 9, 2020
Update MPAS-Source: COMPASS and documentation only

This PR brings in a new mpas-source submodule with changes only to the
ocean core. The changes are limited to internal coupling and
documentation so it should have no impact on E3SM. It includes:
* new EC30to60kmL60E3SMv2r02 mesh with 60 layers as default
  (MPAS-Dev/MPAS-Model/pull/668)
* new EC30to60kmL60E3SMv2r03 mesh with change to gebco bathymetry
  (MPAS-Dev/MPAS-Model/pull/669)
* switch from Travis-CI to Azure Pipelines
  (MPAS-Dev/MPAS-Model/pull/681)
* fix validation for QU240 test step
  (MPAS-Dev/MPAS-Model/pull/660)
* change block tests to partition tests for QU240 RK4 and SE
  (MPAS-Dev/MPAS-Model/pull/657)
* update to version 0.1.11 of the compass environment
  (MPAS-Dev/MPAS-Model/pull/688)

[BFB]
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Sep 10, 2020
pdate MPAS-Source: COMPASS and documentation only

This PR brings in a new mpas-source submodule with changes only to the
ocean core. The changes are limited to internal coupling and
documentation so it should have no impact on E3SM. It includes:
* new EC30to60kmL60E3SMv2r02 mesh with 60 layers as default
  (MPAS-Dev/MPAS-Model/pull/668)
* new EC30to60kmL60E3SMv2r03 mesh with change to gebco bathymetry
  (MPAS-Dev/MPAS-Model/pull/669)
* switch from Travis-CI to Azure Pipelines
  (MPAS-Dev/MPAS-Model/pull/681)
* fix validation for QU240 test step
  (MPAS-Dev/MPAS-Model/pull/660)
* change block tests to partition tests for QU240 RK4 and SE
  (MPAS-Dev/MPAS-Model/pull/657)
* update to version 0.1.11 of the compass environment
  (MPAS-Dev/MPAS-Model/pull/688)

[BFB]
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.

3 participants