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

Organization and cleaning of tests and problems. Phase 2: rearrangement #870

Merged
merged 2 commits into from
Dec 20, 2022

Conversation

mperego
Copy link
Collaborator

@mperego mperego commented Dec 19, 2022

This is part of the work to reorganize Albany folders and tests, see here and follows PR #854.

In particular the new tests structure is

tests
- unit
- corePDEs
- demoPDEs
- landIce

Tests always have in the name one of the above folder, so that it's easy to identify where they belong.
We got rid of the distinction between small and large tests, however, large tests can be built optionally as before.
Remove a couple of tests that are no longer relevant, in particular the Performance tests (We have another repo now for performance testing).

The source folder has been re-organized as well as follows

src
- corePDEs
  - evaluators
  - problems
- demoPDEs
  - evaluators
  - problems
- landIce
  - evaluators
  - problems
  - mpasInterface
  - 
- evaluators
- problems
- utility
- disc

Evaluators that are no longer used have been removed.

This is only a proposed change, we can discuss tomorrow at the Albany meeting what we prefer to do.
Also, we need to manage conflicts with the DofManager PR. (An option would be to split this PR in two, one addressing the test refactor and one the source refactor and start merging only the test refactor PR).

Copy link
Collaborator

@jewatkins jewatkins left a comment

Choose a reason for hiding this comment

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

Looks good.

@@ -44,6 +43,7 @@ set (ALBANY_INCLUDE_DIRS
${Albany_SOURCE_DIR}/src/disc/stk
${Albany_SOURCE_DIR}/src/disc
${Albany_SOURCE_DIR}/src/utility
${Albany_SOURCE_DIR}/src/corePDEs/evaluators
Copy link
Collaborator

Choose a reason for hiding this comment

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

A small nitpick but I would probably call this directory CorePDEs and the other one DemoPDEs to stick with the very loose convention of using CamelCase (e.g. LandIce). Probably better than using snake_case which is used for all other directories so we avoid having to change LandIce.

@mperego mperego self-assigned this Dec 19, 2022
@bartgol
Copy link
Collaborator

bartgol commented Dec 19, 2022

My browser cannot handle the large number of files to diff, and hangs. I agree with Jerry that making case uniform looks cleaner. I'm ok with the reorg.

@mperego
Copy link
Collaborator Author

mperego commented Dec 19, 2022

Thanks @bartgol and @jewatkins. I'm ok using CamelCase, but then for consistency we should change all the other folders? (evaluators, problems, utility, disc.. etc)?

@bartgol
Copy link
Collaborator

bartgol commented Dec 19, 2022

Ugh, yeah, that's annoying. And lower case is easier when typing and autocompleting. I am ok with whatever you pick then.

Btw, if you wanted to change LandIce into landice, I would be fine with that too (saves me from pressing the annoying Shift key...).

@mperego mperego changed the title Rearrangement of problems and tests Organization and cleaning of tests and problems. Phase 2: rearrangement Dec 19, 2022
@jewatkins
Copy link
Collaborator

As long as everyone's okay with changing LandIce to landice or land_ice then that's probably the easier option. I was thinking corePDEs was camelCase. Would it then be corepdes or core_pdes?

@mperego
Copy link
Collaborator Author

mperego commented Dec 19, 2022

We could do camelCase and have landIce, corePDEs, demoPDEs

@bartgol
Copy link
Collaborator

bartgol commented Dec 19, 2022

That works too.

@jewatkins
Copy link
Collaborator

camelCase is okay. I think at least the interface dirs would have to be changed: landIce/interfaceWithMPAS

Now we have three main test folders:
unit
corePDEs
demoPDEs
LandIce

The test names have changed to include the name of folders they belong to.
We removed the small/large folders, however, large tests are run only when they are enabled at configuration.
We removed the performance test, as now we handle performance tests in a different repo
@mperego
Copy link
Collaborator Author

mperego commented Dec 20, 2022

b.t.w. also the LandIce tests change name, because we are pre-pending landIce to their current names (and fix a few inconsistencies)

Created folders
src/corePDEs
src/demoPDEs
and move corresponding evaluators and problems to these folders.
Removed files that were not used
@mperego mperego merged commit 8b0276e into master Dec 20, 2022
@mperego mperego deleted the test_rearrangement branch December 20, 2022 21:06
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