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

Clean up w3profsmd pdlib #792

Merged
merged 20 commits into from
Sep 22, 2022
Merged

Clean up w3profsmd pdlib #792

merged 20 commits into from
Sep 22, 2022

Conversation

MathieuDutSik
Copy link
Contributor

@MathieuDutSik MathieuDutSik commented Sep 20, 2022

Pull Request Summary

Some cleaning of the w3profsmd_pdlib file that should not change any functionality.

Description

Some unused code has been cleaned. Plus a lot of debugging stuff that is not relevant is cleaned up.

Issue(s) addressed

There has been several complaints about code quality and this PR certainly makes it better.

Commit Message

Clean up w3profsmd pdlib

Check list

Testing

  • How were these changes tested? These changes will be tested via the matrix
  • Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) Yes, this is removal of no longer needed. debug statements.
  • Have the matrix regression tests been run (if yes, please note HPC and compiler)? Orion, intel
  • Please indicate the expected changes in the regression test output, (Note the list of known non-identical tests.)
    There should be no changes.
  • Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):
    (will be added below).

@JessicaMeixner-NOAA
Copy link
Collaborator

@MathieuDutSik Can you merge the NOAA-EMC/WW3 develop branch into your branch here?

!
CALL SET_IOBPA_PDLIB

CALL SET_IOBPA_PDLIB
!/
!/ End of W3SPR4 ----------------------------------------------------- /
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we go ahead and clean up the "end of W3SPR4" here as well?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Actually your additions of the subroutine names in the "end" lines have pointed out that we have a lot of "End of XXXX" comments that do not match the subroutines in this file. Are you interested in cleaning this up now, or leaving this for later?

END IF
WRITE(*,*) 'Error: You need to use with JGS_USE_JACOBI'
STOP 'Correct your implicit solver options'
!/
!/ End of W3XYPFSN --------------------------------------------------- /
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should these "End of W3XYPFSN" comments get cleaned up too? There are multiple.

Copy link
Collaborator

@JessicaMeixner-NOAA JessicaMeixner-NOAA left a comment

Choose a reason for hiding this comment

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

I'll start running the regression tests.

!
CALL SET_IOBPA_PDLIB

CALL SET_IOBPA_PDLIB
!/
!/ End of W3SPR4 ----------------------------------------------------- /
Copy link
Collaborator

Choose a reason for hiding this comment

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

Actually your additions of the subroutine names in the "end" lines have pointed out that we have a lot of "End of XXXX" comments that do not match the subroutines in this file. Are you interested in cleaning this up now, or leaving this for later?

@JessicaMeixner-NOAA
Copy link
Collaborator

matrixCompFull.txt
matrixCompSummary.txt
matrixDiff.txt

The output of diffs:

**********************************************************************
********************* non-identical cases ****************************
**********************************************************************
mww3_test_03/./work_PR1_MPI_e                     (1 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2                     (15 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2                     (15 files differ)
mww3_test_03/./work_PR3_UNO_MPI_e                     (1 files differ)
mww3_test_03/./work_PR3_UQ_MPI_e                     (1 files differ)
mww3_test_03/./work_PR1_MPI_d2                     (18 files differ)
mww3_test_03/./work_PR2_UQ_MPI_d2                     (14 files differ)
mww3_test_03/./work_PR3_UQ_MPI_e_c                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_e_c                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2                     (10 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c                     (16 files differ)
mww3_test_03/./work_PR2_UQ_MPI_e                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c                     (15 files differ)
ww3_ta1/./work_UPD0F_U                     (0 files differ)
ww3_tp2.10/./work_MPI_OMPH                     (6 files differ)
ww3_tp2.14/./work_OASACM6                     (1 files differ)
ww3_tp2.14/./work_OASACM                     (1 files differ)
ww3_tp2.14/./work_OASOCM                     (1 files differ)
ww3_tp2.14/./work_OASACM4                     (1 files differ)
ww3_tp2.14/./work_OASACM5                     (1 files differ)
ww3_tp2.14/./work_OASICM                     (1 files differ)
ww3_tp2.14/./work_OASACM2                     (1 files differ)
ww3_tp2.16/./work_MPI_OMPH                     (4 files differ)
ww3_tp2.17/./work_mb                     (1 files differ)
ww3_tp2.17/./work_b                     (1 files differ)
ww3_tp2.17/./work_mc                     (1 files differ)
ww3_tp2.17/./work_a                     (1 files differ)
ww3_tp2.17/./work_c                     (1 files differ)
ww3_tp2.17/./work_ma                     (1 files differ)
ww3_tp2.17/./work_mc1                     (1 files differ)
ww3_tp2.17/./work_ma1                     (1 files differ)

These are expected known not b4b + known mod_def for unstructured not reporducing + tp2.14 tests having some diffs that I've occasionally seen with orion/intel:

***
/work2/noaa/marine/jmeixner/PR_WW3/pr792/regtests/output/ww3_tp2.14/work_OASACM6/debug.root.01_diff.txt
***
10c10
<  oasis_init_comp mpi_comm_local =  -2080374782
---
>  oasis_init_comp mpi_comm_local =  -2080374780
18c18
<  localcomm : -2080374782
---
>  localcomm : -2080374780

Copy link
Collaborator

@JessicaMeixner-NOAA JessicaMeixner-NOAA left a comment

Choose a reason for hiding this comment

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

Thanks @MathieuDutSik for the continued updates of debug print statements!

@JessicaMeixner-NOAA JessicaMeixner-NOAA merged commit c6408fa into NOAA-EMC:develop Sep 22, 2022
@MathieuDutSik MathieuDutSik deleted the clean_up_w3profsmd_pdlib branch September 24, 2022 15:44
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