Remove some goto statements in FV3 and update TAdyn warning range (#3169) // Reduce goto in ufs-weather-model: ccpp/physics (#3167)

[dpsarmie]

Commit Queue Requirements:

• This PR addresses a relevant WM issue (if not, create an issue).
• All subcomponent pull requests (if any) have been reviewed by their code managers.
• Run the full Intel+GNU RT suite (compared to current baselines), preferably on Ursa (Derecho or Hercules are acceptable alternatives). Exceptions: documentation-only PRs, CI-only PRs, etc.
  • Commit log file w/full results from RT suite run (if applicable).
  • Verify that test_changes.list indicates which tests, if any, are changed by this PR. Commit test_changes.list, even if it is empty.
• Fill out all sections of this template.

---

Description:

#3169

This PR will bring in changes made to the FV3 repository that removed some goto statements (EE2 requirements / code modernization) and fixed the range for the warning trigger on TAdyn.
Removing / reducing the number of goto and do continue in the code was an ask by NCO.

#3167

EE2 standards include "Good programming practices must be followed to improve readability. For example, structured control must be used instead of GO TO statements, and code must be well documented."

Here we replace several goto/go to usages and keep current answers (as tested on ursa and wcoss2)

Commit Message:

* UFSWM - Remove some goto statements in FV3 and relax warning for TAdyn
* UFSWM - Reduce goto in UFSATM
  * UFSATM - Update atmos-cubed hash
  * UFSATM - Reduce goto in UFSATM
    * atmos_cubed_sphere - Remove some goto statements in FV3 and relax warning for TAdyn
    * ccpp-physics - Reduce goto in ccpp/physics

Priority:

• Critical Bugfix: Reason
• High: Reason
• Normal

Git Tracking

UFSWM

• Closes Reduce number of goto statements in FV3 submodule #3168
• Part of Remove goto statements from GFS package NOAA-EMC/GFS#19

Sub component Pull Requests:

• UFSATM: Remove some goto statements in FV3 and relax TAdyn warning range NOAA-EMC/ufsatm#1083
  • atmos_cubed_sphere: Removal of some goto statements NOAA-GFDL/GFDL_atmos_cubed_sphere#391
  • ccpp-physics: Reduce goto in ccpp-physics ccpp-physics#367

UFSWM Blocking Dependencies:

• None

Documentation:

• Documentation update NOT required.

---

Changes

Regression Test Changes (Please commit test_changes.list):

• No Baseline Changes.

Input data Changes:

• None.

Library Changes/Upgrades:

Testing Log:

• RDHPCS
  • Orion
  • Hercules
  • GaeaC6
  • Derecho
  • Ursa
• WCOSS2
  • Dogwood/Cactus
  • Acorn
• CI
• opnReqTest (complete task if unnecessary)

[jkbk2004]

3 cases failed on derecho: fail_test_conus13km_debug_decomp_gnu, fail_test_rap_control_dyn64_phy32_debug_gnu, fail_test_conus13km_radar_tten_debug_gnu
0a52 in ???
#28 0xaf1569 in ???
#29 0x9eed17 in ???
#30 0x429c6f in ???
#31 0xbe30e3 in ???
#32 0xbe3417 in ???
#33 0xf1bdba in ???
#34 0xf10402 in ???
#35 0xbe1f55 in ???
#36 0x905337 in ???
#37 0x71864c in ???
#38 0x41c9f0 in ufs
at /glade/derecho/scratch/jongkim/UFS-RT/rt-3169/driver/UFS.F90:405
#39 0x41d0bf in main
at /glade/derecho/scratch/jongkim/UFS-RT/rt-3169/driver/UFS.F90:37
MPICH ERROR [Rank 64] [job id 81c08ee4-55c2-48e0-b7a5-281875ffa80a] [Mon Apr 13 21:14:19 2026] [dec2288] - Abort(1)
(rank 64 in comm 0): application called MPI_Abort(MPI_COMM_WORLD, 1) - process 64
@gspetro-NOAA we need a bit of experiment with develop branch to see all these cases behave on derecho.

[NickSzapiro-NOAA]

I don't see a run_dir @jkbk2004 . Do you know what the errors are?

[BrianCurtis-NOAA]

Should I hold testing WCOSS2/Acorn for now?

[jkbk2004]

I don't see a run_dir @jkbk2004 . Do you know what the errors are?

@gspetro-NOAA Rerun for those 3 cases looks ok on derecho. It might be derecho system's random behavior.

[gspetro-NOAA]

@dpsarmie Please revert .gitmodules and update the UFSATM hash to 1486aff

[dpsarmie]

@dpsarmie Please revert .gitmodules and update the UFSATM hash to 1486aff

Ok, .gitmodules changes reverted and UFSATM hash updated to 1486aff. Should be ready for final reviews.