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

Bug fixes to drag_suite.F90 and GFS_surface_composites.F90 #140

Conversation

mdtoyNOAA
Copy link
Collaborator

@mdtoyNOAA mdtoyNOAA commented Mar 19, 2022

Fixed bug in drag_suite.F90 that prevented stochastic physics from functioning for small-scale GWD and turbulent orographic form drag. Also, deleted commented-out lines from previous commit.

Fixed bugs in GFS_surface_composites.F90 (bug fixes by @tanyasmirnova ).

Testing

How were these changes tested?
What compilers / HPCs was it tested with? Hera: Intel and GNU. Jet: Intel.
Are the changes covered by regression tests? Yes.
Have the ufs-weather-model regression test been run? On what platform?

  • Will the code updates change regression test baseline? Yes.
  • Please commit the regression test log files in your ufs-weather-model branch

Baseline Reg test data on Hera at:
/scratch1/BMC/wrfruc/mtoy/stmp4/Michael.Toy/FV3_RT/REGRESSION_TEST_INTEL.2022_03_19
and
/scratch1/BMC/wrfruc/mtoy/stmp4/Michael.Toy/FV3_RT/REGRESSION_TEST_GNU.2022_03_19

Baseline Reg test data on Jet at:
/lfs4/BMC/wrfruc/mtoy/RT_BASELINE/Michael.Toy/FV3_RT/REGRESSION_TEST_INTEL.2022_03_19

@SamuelTrahanNOAA
Copy link
Collaborator

Is this expected to change the results of any regression tests?

@tanyasmirnova
Copy link
Collaborator

@SamuelTrahanNOAA Sam, yes, my bug fix will change the results.

@SamuelTrahanNOAA
Copy link
Collaborator

If it changes results, then I need you to generate baselines. Once you have the baselines, I will copy them to common areas, run the final regression tests, and merge.

@tanyasmirnova
Copy link
Collaborator

@mdtoyNOAA Mike, could you please provide the baseline?

@tanyasmirnova
Copy link
Collaborator

@SamuelTrahanNOAA The baseline for my change is on jet in /mnt/lfs4/BMC/wrfruc/smirnova/RRFS_code/RRFS_regtest/tests

@SamuelTrahanNOAA
Copy link
Collaborator

You also need to re-enable the disabled regression test in rt.conf and rt_gnu.conf:

RUN     | cpld_debug_p8         |                | fv3         |

@SamuelTrahanNOAA
Copy link
Collaborator

@tanyasmirnova That is not the location of your baseline. That is the location of your "tests" directory where you ran rt.sh. I need to know where the REGRESSION_TEST_INTEL directory resides.

@mdtoyNOAA
Copy link
Collaborator Author

mdtoyNOAA commented Mar 21, 2022 via email

@SamuelTrahanNOAA
Copy link
Collaborator

SamuelTrahanNOAA commented Mar 21, 2022

@tanyasmirnova Also, you did not generate the baseline for the test we had disabled.

#COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_p8 | - wcoss_cray | fv3 |
#RUN | cpld_debug_p8 | - wcoss_cray | fv3 |

AFTER I copy your baselines, you can rerun just that one test rather than the whole set. Do not do it yet, or it'll delete all of the existing baselines you generated!

@SamuelTrahanNOAA
Copy link
Collaborator

@mdtoyNOAA Your baselines lack the cpld_debug_p8 directory, which is generated by the test that we had disabled due to Tanya's bug fix breaking it. Please rerun the baseline generation using only these two lines:

COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_p8 | - wcoss_cray | fv3 |
RUN | cpld_debug_p8 | - wcoss_cray | fv3 |

It'll generate just that test's baseline.

@tanyasmirnova
Copy link
Collaborator

@SamuelTrahanNOAA Sam, the baseline is in/lfs1/BMC/wrfruc/smirnova/wrfruc/Tanya.Smirnova/RT_RUNDIRS/Tanya.Smirnova/FV3_RT/rt_282750
@mdtoyNOAA Mike, did you create the baseline in you RT?

@mdtoyNOAA
Copy link
Collaborator Author

mdtoyNOAA commented Mar 21, 2022 via email

@SamuelTrahanNOAA
Copy link
Collaborator

@tanyasmirnova This is also not the baseline directory. It is the directory in which your workflow executed.

/lfs1/BMC/wrfruc/smirnova/wrfruc/Tanya.Smirnova/RT_RUNDIRS/Tanya.Smirnova/FV3_RT/rt_282750

There is a directory named "REGRESSION_TEST_INTEL" somewhere, with your baselines.

However, if yours are identical to Mike's, then I don't need them (it would be redundant).

@tanyasmirnova
Copy link
Collaborator

@SamuelTrahanNOAA @mdtoyNOAA Yes, Mike's baseline should be used because he has combined both mine and his bug fixes.

@mdtoyNOAA
Copy link
Collaborator Author

@SamuelTrahanNOAA I have added the successful test "cpld_debug_p8" to my baselines at:

Hera:
/scratch1/BMC/wrfruc/mtoy/stmp4/Michael.Toy/FV3_RT/REGRESSION_TEST_INTEL.2022_03_19
and
/scratch1/BMC/wrfruc/mtoy/stmp4/Michael.Toy/FV3_RT/REGRESSION_TEST_GNU.2022_03_19

Jet:
/lfs4/BMC/wrfruc/mtoy/RT_BASELINE/Michael.Toy/FV3_RT/REGRESSION_TEST_INTEL.2022_03_19

Do I need to copy and paste the run log for "cpld_debug_p8" into the "RegressionTests_..log" files that were generated on 2022_03_19 for the full tests (minus "cpld_debug_p8") and push these to my fork?

@SamuelTrahanNOAA
Copy link
Collaborator

I have copied the baselines and I am running regression tests now.

@SamuelTrahanNOAA SamuelTrahanNOAA merged commit 78620d6 into NOAA-GSL:RRFS_dev Mar 21, 2022
@mdtoyNOAA
Copy link
Collaborator Author

mdtoyNOAA commented Oct 11, 2022 via email

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.

4 participants