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

Add switch ifdefs for wmesmf SCRIP #537

Merged
merged 4 commits into from
Nov 19, 2021

Conversation

JessicaMeixner-NOAA
Copy link
Collaborator

Pull Request Summary

Adding switch ifdefs for scrip in wmesmf

Description

When the addition of corner points was added, we used scrip subroutines but did not add the switch ifdefs. These add the ifdefs. There is no expected answer changes for this, but it should solve the issues of compiling wmesmf without the SCRIP switch.

Issue(s) addressed

Check list

Commit Message

  • Add SCRIP ifdefs for wmesmf

Testing

  • How were these changes tested? These were tested in the ufs-weather-model control_atmwav test which does not require the SCRIP switch. The SCRIP and SCRIPNC were removed from the switch file and the test with these if-defs still succeeded. (Note, to run successfully also had to fix some warnings in a print statement, but I'll push those changes via a separate PR as they're unrelated to the issues here.)
  • Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) No, we do not test wmesmf within the ww3 standalone regtests
  • If a new feature was added, was a new regression test added? no new feature
  • Have regression tests been run? no, as the regtests do not cover this routine.
  • Which compiler / HPC you used to run the regression tests in the PR?
  • Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):
    Please indicate the expected changes in the outputs (excluding the known list of non-identical tests).
  • Please list which labels code managers should add to indicate code changes:
    No code changes.

Use CPP ifdefs instead of switches for pre-processing and convert all code from ftn to F90 files. (ftn->src) 
The tools for converting ftn->src can be found in the model/tools directory.
@JessicaMeixner-NOAA JessicaMeixner-NOAA added the bug Something isn't working label Nov 17, 2021
Copy link
Contributor

@aliabdolali aliabdolali left a comment

Choose a reason for hiding this comment

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

I know this was raised for the CMake build and ww3_multi _esmf. Did you test the ufs-weather-model with the changes? considering SCRIP is in the switch, it might be unnecessary.

@JessicaMeixner-NOAA
Copy link
Collaborator Author

I only tested in ufs-weather-model on a test that I knew did not use SCRIP and I removed SCRIP and SCRIPNC. As reported in the PR, this test succeeded. I did not run a full test in ufs-weather-model without changes. I can do that now.

@aliabdolali
Copy link
Contributor

I only tested in ufs-weather-model on a test that I knew did not use SCRIP and I removed SCRIP and SCRIPNC. As reported in the PR, this test succeeded. I did not run a full test in ufs-weather-model without changes. I can do that now.

that would be great, then we can proceed with the merge once WW3 regtests outputs are ready (tonight)

@JessicaMeixner-NOAA
Copy link
Collaborator Author

@aliabdolali I ran ufs-weather-model with the wrong WW3 branch, so I'll have to re-do these tests today. I'll post results when I have them.

@aliabdolali
Copy link
Contributor

I have the following changes:


********************* non-identical cases ****************************


mww3_test_03/./work_PR2_UQ_MPI_d2 (6 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2 (8 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c (8 files differ)
mww3_test_03/./work_PR1_MPI_d2 (8 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c (10 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2 (8 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2 (8 files differ)
mww3_test_05/./work_ST4_PR2_UNO_OMP (1 files differ)
mww3_test_05/./work_ST2_PR3_UQ_MPI (11 files differ)
mww3_test_05/./work_ST4_PR3_UQ_OMP (1 files differ)
mww3_test_05/./work_ST4_PR2_UQ_OMP (1 files differ)
mww3_test_07/./work_PR3_UQ (3 files differ)
ww3_tp2.10/./work_MPI_OMPH (6 files differ)
ww3_tp2.16/./work_MPI_OMPH (6 files differ)
ww3_ts1/./work_ST4_TSA (3 files differ)
ww3_ufs1.3/./work_a (1 files differ)

I need to do further analysis, something is wrong. I'll let you know.

@JessicaMeixner-NOAA
Copy link
Collaborator Author

That is indeed strange as the regression tests should have no impact with this change. I'll run some tests too.

@aliabdolali
Copy link
Contributor

Here are the outputs of my comparison, with just pre-known not b4b cases

*```


********************* non-identical cases ****************************


mww3_test_03/./work_PR2_UQ_MPI_d2 (6 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2 (8 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c (8 files differ)
mww3_test_03/./work_PR1_MPI_d2 (13 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c (7 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2 (8 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2 (8 files differ)
mww3_test_07/./work_PR3_UQ (3 files differ)
ww3_tp2.10/./work_MPI_OMPH (6 files differ)
ww3_tp2.16/./work_MPI_OMPH (5 files differ)
ww3_ufs1.3/./work_a (1 files differ)



[matrixCompFull.txt](https://github.com/NOAA-EMC/WW3/files/7565406/matrixCompFull.txt)
[matrixCompSummary.txt](https://github.com/NOAA-EMC/WW3/files/7565407/matrixCompSummary.txt)
[matrixDiff.txt](https://github.com/NOAA-EMC/WW3/files/7565408/matrixDiff.txt)
s

Copy link
Contributor

@aliabdolali aliabdolali left a comment

Choose a reason for hiding this comment

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

We can merge it once the ufs-weather-model passed

@JessicaMeixner-NOAA
Copy link
Collaborator Author

Okay- the ufs-weather-model waves tests run on hera: /scratch2/NCEPDEV/climate/Jessica.Meixner/PR_WW3/scrip/ufs-weather-model/tests/RegressionTests_hera.intel.log (I tried to copy it here but my hera window is temporarily acting up and I couldn't get the transfer to work). They even work without the other fix if you don't have "error" int he directory name that will trigger warning messages as errors (oops).

@aliabdolali aliabdolali merged commit 349751a into NOAA-EMC:develop Nov 19, 2021
@JessicaMeixner-NOAA JessicaMeixner-NOAA deleted the bug/scripesmf branch November 22, 2021 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

wmesmf needs SCRIP/SCRIPNC CPP ifdefs added No rule to make target obj/wmscrpmd.o needed by obj/wmesmfmd.o
2 participants