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 option to write 3d soilt, soilw and soill variables to a history file #2062

Merged
merged 30 commits into from
Feb 15, 2024

Conversation

DusanJovic-NOAA
Copy link
Collaborator

@DusanJovic-NOAA DusanJovic-NOAA commented Dec 22, 2023

Commit Queue Requirements:

  • Fill out all sections of this template.

  • All sub component pull requests have been reviewed by their code managers.

  • Run the full RT suite (compared to current baselines) on either Hera/Derecho/Hercules AND have committed the log to my PR branch.
    RegressionTests_hera.log

  • Add list of all failed regression tests in "Regression Tests" section.

PR Information

Description

This PR adds three 3D soil variables (soilt, soilw and soill) to a history file if corresponding entries are specified in diag_table file. The new 3d versions of these variables is identical to a set of 2d variables currently available (soilt1, soilt2, etc). For example, replacing:

> "gfs_sfc",     "soilt1",      "soilt1"     "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "soilt2",      "soilt2"     "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "soilt3",      "soilt3"     "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "soilt4",      "soilt4"     "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "soilw1",      "soilw1"     "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "soilw2",      "soilw2"     "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "soilw3",      "soilw3"     "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "soilw4",      "soilw4"     "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "slc_1",       "soill1",    "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "slc_2",       "soill2",    "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "slc_3",       "soill3",    "fv3_history2d",  "all",  .false.,  "none",  2
> "gfs_sfc",     "slc_4",       "soill4",    "fv3_history2d",  "all",  .false.,  "none",  2

with

< "gfs_sfc",     "soilt",       "soilt"      "fv3_history2d",  "all",  .false.,  "none",  2
< "gfs_sfc",     "soilw",       "soilw"      "fv3_history2d",  "all",  .false.,  "none",  2
< "gfs_sfc",     "soill",       "soill",     "fv3_history2d",  "all",  .false.,  "none",  2

will write 3D version of the above soil variables to a history file

Commit Message

Add option to write 3d soilt, soilw and soill variables to a history file

Priority

  • Critical Bugfix (This PR contains a critical bug fix and should be prioritized.)
  • High (This PR contains a feature or fix needed for a time-sensitive project (eg, retrospectives, implementations))
  • Normal

Blocking Dependencies

Git Issues Fixed By This PR

Closes #1055

Changes

Subcomponent (with links)

Input data

  • No changes are expected to input data.
  • Changes are expected to input data:
    • New input data.
    • Updated input data.

Regression Tests:

  • No changes are expected to any regression test.
  • Changes are expected to the following tests:
FAILED REGRESSION TESTS control_CubedSphereGrid_parallel

Libraries

  • Not Needed
  • Needed
    • Create separate issue in JCSDA/spack-stack asking for update to library. Include library name, library version.
    • Add issue link from JCSDA/spack-stack following this item

Testing Log:

  • RDHPCS
    • Hera
    • Orion
    • Hercules
    • Jet
    • Gaea
    • Derecho
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
    • Completed
  • opnReqTest
    • N/A
    • Log attached to comment

@FernandoAndrade-NOAA
Copy link
Collaborator

Hi @DusanJovic-NOAA, please go ahead and sync your branches with the latest develop, we'd like to get started on testing this PR next, thank you.

@DusanJovic-NOAA
Copy link
Collaborator Author

@FernandoAndrade-NOAA Done.

@FernandoAndrade-NOAA FernandoAndrade-NOAA added Baseline Updates Current baselines will be updated. Waiting for Reviews The PR is waiting for reviews from associated component PR's. labels Feb 13, 2024
@zach1221 zach1221 added Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. and removed Waiting for Reviews The PR is waiting for reviews from associated component PR's. labels Feb 13, 2024
@FernandoAndrade-NOAA
Copy link
Collaborator

Gaea failed 4 tests, these failures do not look like standard timeouts. I'm checking up on the err to see what may be going on.

control_c384_intel 040 failed in run_test
control_decomp_p8_intel 053 failed in run_test
rap_sfcdiff_intel 072 failed in run_test
rap_noah_sfcdiff_cires_ugwp_debug_intel 110 failed in run_test

@FernandoAndrade-NOAA
Copy link
Collaborator

Gaea failed 4 tests, these failures do not look like standard timeouts. I'm checking up on the err to see what may be going on.

control_c384_intel 040 failed in run_test
control_decomp_p8_intel 053 failed in run_test
rap_sfcdiff_intel 072 failed in run_test
rap_noah_sfcdiff_cires_ugwp_debug_intel 110 failed in run_test

rundir: /gpfs/f5/epic/scratch/Fernando.Andrade-maldonado/FV3_RT/rt_238940/

@FernandoAndrade-NOAA
Copy link
Collaborator

@jkbk2004 @zach1221 FYI, the control_c384 intel rerun with develop passed, so the issues may be coming from the PR updates. It should also be noted that gaea seems to have a bit of performance degradation since last night.

@FernandoAndrade-NOAA
Copy link
Collaborator

Given the recent email regarding issues with Gaea jobs failing after yesterday's maintenance that should now be resolved, I'm rerunning the failed tests to verify if it was just a system issue.

@FernandoAndrade-NOAA
Copy link
Collaborator

Double checking the log diff, the rap_sfcdiff_restart is missing from the Gaea log, likely due to the issues from the maintenance. I'm rerunning that as well. The other 4 reported test failures passed fine this time and have their success appended to the Gaea log.

@FernandoAndrade-NOAA
Copy link
Collaborator

Ok, I think we're good to continue with the merge process in the fv3 sub pr. @zach1221 FYI

@zach1221
Copy link
Collaborator

@DusanJovic-NOAA fv3atm pr is merged. Please update hash and revert .gitmodule url.
NOAA-EMC/fv3atm@0fe9ba3

@zach1221 zach1221 merged commit e464f5b into ufs-community:develop Feb 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Baseline Updates Current baselines will be updated. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add vertical dimension to certain surface fields
5 participants