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.

Sign up for GitHub

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

Fix the broken error detection in GFS_phys_time_vary.fv3.F90 and pointer issues in c3 scheme #1917

Closed
wants to merge 12 commits into from
Closed

Fix the broken error detection in GFS_phys_time_vary.fv3.F90 and pointer issues in c3 scheme #1917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4a12ef3
Fix race condition in GFS_phys_time_vary.fv3.F90 error detection
SamuelTrahanNOAA Sep 21, 2023
4518b82
More bug fixes to GFS_phys_time_vary.fv3.F90:
SamuelTrahanNOAA Sep 21, 2023
68551bf
ccpp-physics: initialize errmsg & errflg in noahmp_tables.f90
SamuelTrahanNOAA Sep 21, 2023
a3683b9
hera tests passed
SamuelTrahanNOAA Sep 22, 2023
f1f2437
point to sam's branch
SamuelTrahanNOAA Sep 22, 2023
95f6576
ccpp-physics: only read h2odata, ozdata and noahmp table when they ar…
SamuelTrahanNOAA Sep 22, 2023
cd41a8a
hera tests passed again
SamuelTrahanNOAA Sep 22, 2023
70486d5
update fv3 & ccpp to upstream develop and merge c3 fix
SamuelTrahanNOAA Sep 28, 2023
f5a7fe4
merge upstream develop
SamuelTrahanNOAA Sep 28, 2023
eeb721e
delete removed testsw
SamuelTrahanNOAA Sep 28, 2023
4fd4b8c
hera tests passed
SamuelTrahanNOAA Sep 28, 2023
298a1e3
new regtests for c3 pointer fix
SamuelTrahanNOAA Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/SamuelTrahanNOAA/fv3atm
branch = bugfix/errmsgflg-race-condition
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 2 files
+2 −2 .gitmodules
+1 −1 ccpp/physics
2,422 changes: 1,158 additions & 1,264 deletions tests/logs/RegressionTests_hera.log
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ RUN | regional_ifi_control | + acorn
RUN | regional_ifi_decomp | + acorn | |
RUN | regional_ifi_2threads | + acorn | |

COMPILE | rrfs | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl,FV3_HRRR_gf,FV3_HRRR_c3 -D32BIT=ON | | fv3 |
COMPILE | rrfs | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 |
RUN | rap_control | | baseline |
RUN | regional_spp_sppt_shum_skeb | | baseline |
RUN | rap_decomp | - noaacloud | |
Expand All @@ -131,8 +131,6 @@ RUN | hrrr_control_restart_qr | - wcoss2 noaacloud
RUN | rrfs_v1beta | | baseline |
RUN | rrfs_v1nssl | | baseline |
RUN | rrfs_v1nssl_nohailnoccn | | baseline |
RUN | hrrr_gf | - noaacloud | baseline |
RUN | hrrr_c3 | - noaacloud | baseline |

COMPILE | csawmg | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | - noaacloud | fv3 |
RUN | control_csawmg | - gaea.intel noaacloud | baseline |
Expand All @@ -148,7 +146,7 @@ RUN | control_p8_faster | - noaacloud
RUN | regional_control_faster | | baseline |

### DEBUG ATM tests ###
COMPILE | atm_debug_dyn32 | intel | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta | - noaacloud | fv3 |
COMPILE | atm_debug_dyn32 | intel | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta,FV3_HRRR_c3,FV3_HRRR_gf | - noaacloud | fv3 |
RUN | control_CubedSphereGrid_debug | - noaacloud | baseline |
RUN | control_wrtGauss_netcdf_parallel_debug | - noaacloud | baseline |
RUN | control_stochy_debug | - noaacloud | baseline |
Expand All @@ -161,6 +159,8 @@ RUN | control_debug_p8 | - noaacloud
RUN | regional_debug | - noaacloud | baseline |
RUN | rap_control_debug | - noaacloud | baseline |
RUN | hrrr_control_debug | - noaacloud | baseline |
RUN | hrrr_gf_debug | - noaacloud | baseline |
RUN | hrrr_c3_debug | - noaacloud | baseline |
RUN | rap_unified_drag_suite_debug | - noaacloud | |
RUN | rap_diag_debug | - noaacloud | baseline |
RUN | rap_cires_ugwp_debug | - noaacloud | baseline |
Expand Down Expand Up @@ -204,7 +204,7 @@ RUN | conus13km_restart_mismatch | - noaacloud
COMPILE | rrfs_dyn64_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON | - noaacloud | fv3 |
RUN | rap_control_dyn64_phy32 | - noaacloud | baseline |

COMPILE | rrfs_dyn32_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR,FV3_HRRR_gf -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | - noaacloud | fv3 |
COMPILE | rrfs_dyn32_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | - noaacloud | fv3 |
RUN | rap_control_debug_dyn32_phy32 | - noaacloud | baseline |
RUN | hrrr_control_debug_dyn32_phy32 | - noaacloud | baseline |
RUN | conus13km_debug | - noaacloud | baseline |
Expand Down Expand Up @@ -315,7 +315,7 @@ RUN | control_ras | + hera cheyenne hercul
RUN | control_p8 | + hera cheyenne hercules | baseline |
RUN | control_flake | + hera cheyenne hercules | baseline |

COMPILE | rrfs | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_HRRR_gf,FV3_HRRR_c3 -D32BIT=ON | + hera cheyenne hercules | fv3 |
COMPILE | rrfs | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | + hera cheyenne hercules | fv3 |
RUN | rap_control | + hera cheyenne hercules | baseline |
RUN | rap_decomp | + hera cheyenne hercules | |
RUN | rap_2threads | + hera cheyenne hercules | |
Expand All @@ -330,10 +330,6 @@ RUN | hrrr_control_decomp | + hera cheyenne hercul
RUN | hrrr_control_restart | + hera cheyenne hercules | | hrrr_control
RUN | hrrr_control_restart_qr | + hera cheyenne hercules | | hrrr_control_qr
RUN | rrfs_v1beta | + hera cheyenne hercules | baseline |
RUN | hrrr_gf | + hera cheyenne hercules | baseline |

# Crashes on Cheyenne
# RUN | hrrr_c3 | + hera cheyenne hercules | baseline |

### CCPP DEBUG tests ###
# Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
Expand All @@ -342,6 +338,8 @@ RUN | control_diag_debug | + hera cheyenne hercul
RUN | regional_debug | + hera cheyenne hercules | baseline |
RUN | rap_control_debug | + hera cheyenne hercules | baseline |
RUN | hrrr_control_debug | + hera cheyenne hercules | baseline |
RUN | hrrr_gf_debug | + hera cheyenne hercules | baseline |
RUN | hrrr_c3_debug | + hera cheyenne hercules | baseline |
RUN | rap_diag_debug | + hera cheyenne hercules | baseline |
RUN | rap_noah_sfcdiff_cires_ugwp_debug | + hera cheyenne hercules | baseline |
RUN | rap_progcld_thompson_debug | + hera cheyenne hercules | baseline |
Expand Down
63 changes: 0 additions & 63 deletions tests/tests/hrrr_c3
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions tests/tests/hrrr_c3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
##############################################################################
#
# HRRR debug control test: atmosphere only at C96L127
#
###############################################################################

export TEST_DESCR="Compare HRRR CLM Lake debug results with previous trunk version"

export CNTL_DIR=hrrr_c3_debug

export LIST_FILES="sfcf000.nc \
sfcf001.nc \
atmf000.nc \
atmf001.nc"

export_hrrr
export WRITE_DOPOST=.false.
export OUTPUT_FH='0 1'
export FHMAX=1
export CCPP_SUITE=FV3_HRRR_c3
export DO_DEEP=.true.
export SHAL_CNV=.true.
export IMFSHALCNV=5
export IMFDEEPCNV=5
63 changes: 0 additions & 63 deletions tests/tests/hrrr_gf
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions tests/tests/hrrr_gf_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
##############################################################################
#
# HRRR debug control test: atmosphere only at C96L127
#
###############################################################################

export TEST_DESCR="Compare HRRR CLM Lake debug results with previous trunk version"

export CNTL_DIR=hrrr_gf_debug

export LIST_FILES="sfcf000.nc \
sfcf001.nc \
atmf000.nc \
atmf001.nc"

export_hrrr
export WRITE_DOPOST=.false.
export OUTPUT_FH='0 1'
export FHMAX=1
export CCPP_SUITE=FV3_HRRR_gf
export DO_DEEP=.true.
export SHAL_CNV=.true.
export IMFSHALCNV=3
export IMFDEEPCNV=3