Initiatlise XFT variable outside of ST2 switch

[ukmo-daisybrown]

Fixes #1540

Pull Request Summary

A bugfix to initialise the variable XFT when the ST2 switch hasn't been chosen.

Description

This is a one line change which should resolve the inconsistencies found in mod_def files when the ST2 switch is not set for some compilers. It should not have any other external effects.

Issue(s) addressed

fixes #1540

Commit Message

Initiatlise XFT variable outside of ST2 switch

Check list

• Branch is up to date with the authoritative repository (NOAA-EMC) develop branch.
• Checked the checklist for a developer submitting to develop.
• If a version number update is required, checked the updating version number checklist.
• If a new feature was added, a regression test for testing the new feature is added.

Testing

Tests were completed on our Cray EX computer with the GNU compiler.

Difference files:

matrixCompSummary.txt
matrixDiff.txt
matrixCompFull.txt

Overview:

---

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

---

mww3_test_03/./work_PR3_UQ_MPI_d2 (16 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c (12 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2 (9 files differ)
mww3_test_03/./work_PR1_MPI_d2 (10 files differ)
mww3_test_03/./work_PR2_UQ_MPI_d2 (15 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c (17 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2 (12 files differ)
mww3_test_05/./work_ST4_PR3_UQ_OMP (5 files differ)
mww3_test_05/./work_ST4_PR2_UQ_MPI_OMPH (5 files differ)
mww3_test_05/./work_ST4_PR2_UNO_MPI (5 files differ)
mww3_test_05/./work_ST4_PR2_UQ_OMP (5 files differ)
mww3_test_05/./work_ST4_PR3_UQ_MPI_OMPH (5 files differ)
mww3_test_05/./work_ST4_PR2_UNO_OMP (5 files differ)
mww3_test_05/./work_ST4_PR3_UNO_MPI (5 files differ)
mww3_test_05/./work_ST4_PR1_OMP (5 files differ)
mww3_test_05/./work_ST4_PR3_UQ_MPI (5 files differ)
mww3_test_05/./work_ST4_PR3_UNO_MPI_OMPH (5 files differ)
mww3_test_05/./work_ST4_PR3_UNO_OMP (5 files differ)
mww3_test_05/./work_ST4_PR1_MPI_OMPH (5 files differ)
mww3_test_05/./work_ST4_PR2_UNO_MPI_OMPH (5 files differ)
mww3_test_05/./work_ST4_PR2_UQ_MPI (5 files differ)
mww3_test_05/./work_ST4_PR1_MPI (5 files differ)
mww3_test_08/./work_lowres_jonswap (1 files differ)
mww3_test_08/./work_lowres (1 files differ)
mww3_test_08/./work_ST4_PR3_UQ_MPI (2 files differ)
mww3_test_09/./work_MPI_ASCII (0 files differ)
ww3_ta1/./work_UPD5_O (1 files differ)
ww3_ta1/./work_UPD6_U (1 files differ)
ww3_ta1/./work_UPD5_U_cap (1 files differ)
ww3_ta1/./work_UPD2_U (1 files differ)
ww3_ta1/./work_UPD2_O (1 files differ)
ww3_ta1/./work_UPD6_O (1 files differ)
ww3_ta1/./work_UPD0F_U (1 files differ)
ww3_ta1/./work_UPD3_U (1 files differ)
ww3_ta1/./work_UPD3_O (1 files differ)
ww3_ta1/./work_UPD5_U (1 files differ)
ww3_ta1/./work_UPD2_U_cap (1 files differ)
ww3_ta1/./work_UPD6_U_cap (1 files differ)
ww3_ta1/./work_UPD0F_O (1 files differ)
ww3_ta1/./work_UPD3_U_cap (1 files differ)
ww3_tp1.8/./work_PR3_UQ (1 files differ)
ww3_tp2.10/./work_MPI_OMPH (8 files differ)
ww3_tp2.10/./work_MPI (1 files differ)
ww3_tp2.11/./work_MPI (2 files differ)
ww3_tp2.14/./work_OASACM2 (1 files differ)
ww3_tp2.14/./work_OASACM5 (1 files differ)
ww3_tp2.14/./work_OASICM (1 files differ)
ww3_tp2.14/./work_OASACM3 (1 files differ)
ww3_tp2.14/./work_OASACM4 (1 files differ)
ww3_tp2.14/./work_OASOCM (1 files differ)
ww3_tp2.14/./work_OASACM6 (1 files differ)
ww3_tp2.14/./work_OASACM (1 files differ)
ww3_tp2.15/./work_5km (1 files differ)
ww3_tp2.15/./work_PR3_UQ (1 files differ)
ww3_tp2.15/./work_PR3_UQ_RHO_MPI (1 files differ)
ww3_tp2.15/./work_PR3_UQ_RHO (1 files differ)
ww3_tp2.15/./work_PR3_UQ_CONST (1 files differ)
ww3_tp2.15/./work_ST4FLX5 (1 files differ)
ww3_tp2.15/./work_MPI_5km (1 files differ)
ww3_tp2.15/./work_PR3_UQ_MPI (1 files differ)
ww3_tp2.17/./work_mb (1 files differ)
ww3_tp2.17/./work_c (1 files differ)
ww3_tp2.17/./work_ma (1 files differ)
ww3_tp2.17/./work_mc1 (1 files differ)
ww3_tp2.17/./work_mc (1 files differ)
ww3_tp2.17/./work_b (1 files differ)
ww3_tp2.17/./work_a (1 files differ)
ww3_tp2.17/./work_ma1 (1 files differ)
ww3_tp2.18/./work_TIDE (1 files differ)
ww3_tp2.18/./work_TIDE_MPI (1 files differ)
ww3_tp2.21/./work_mb (2 files differ)
ww3_tp2.21/./work_ma (2 files differ)
ww3_tp2.21/./work_b_metis (1 files differ)
ww3_tp2.21/./work_b (1 files differ)
ww3_tp2.21/./work_a (1 files differ)
ww3_tp2.6/./work_ST4 (1 files differ)
ww3_tp2.6/./work_ST4_ASCII (2 files differ)
ww3_ts1/./work_Romero (1 files differ)
ww3_ts1/./work_ST4_T500 (1 files differ)
ww3_ts1/./work_T707GQM (1 files differ)
ww3_ts1/./work_ST4_CAP (1 files differ)
ww3_ts1/./work_T701 (1 files differ)
ww3_ts1/./work_T713GQM (1 files differ)
ww3_ts1/./work_ST4_TSA (1 files differ)
ww3_ts1/./work_ST4_T700 (1 files differ)
ww3_ts1/./work_ST4 (1 files differ)
ww3_ts1/./work_ST4_GMD (1 files differ)
ww3_ts1/./work_ST4_WRT (1 files differ)
ww3_ts1/./work_T702 (1 files differ)
ww3_ts2/./work_ST4_PR2_UNO (1 files differ)
ww3_ts2/./work_ST4_PR3_UNO (1 files differ)
ww3_ts2/./work_ST4_PR3_UQ (1 files differ)
ww3_ts2/./work_ST4_PR2_UQ (1 files differ)
ww3_ts2/./work_ST4_PR1 (1 files differ)
ww3_ts3/./work_ST4_FLD2_MPI (1 files differ)
ww3_ts3/./work_ST4_PR3_UQ_OMP (1 files differ)
ww3_ts3/./work_ST4_FLD1_MPI (1 files differ)
ww3_ts3/./work_ST4_PR2_UQ_MPI_OMPH (1 files differ)
ww3_ts3/./work_ST4_PR2_UNO_MPI (1 files differ)
ww3_ts3/./work_ST4_PR2_UQ_OMP (1 files differ)
ww3_ts3/./work_ST4_PR3_UQ_MPI_OMPH (1 files differ)
ww3_ts3/./work_ST4_PR2_UNO_OMP (1 files differ)
ww3_ts3/./work_ST4_PR3_UNO_MPI (1 files differ)
ww3_ts3/./work_ST4_PR1_OMP (1 files differ)
ww3_ts3/./work_ST4_PR3_UQ_MPI (1 files differ)
ww3_ts3/./work_ST4_PR3_UNO_MPI_OMPH (1 files differ)
ww3_ts3/./work_ST4_PR3_UNO_OMP (1 files differ)
ww3_ts3/./work_ST4_PR1_MPI_OMPH (1 files differ)
ww3_ts3/./work_ST4_PR2_UNO_MPI_OMPH (1 files differ)
ww3_ts3/./work_ST4_PR2_UQ_MPI (1 files differ)
ww3_ts3/./work_ST4_PR1_MPI (1 files differ)

[mingchen-NOAA]

@ukmo-daisybrown I will start review and test this PR.

[mingchen-NOAA]

Regression tests passed on Hercules Intel

**********************************************************************
********************* non-identical cases ****************************
**********************************************************************
mww3_test_03/./work_PR1_MPI_d2                     (14 files differ)
mww3_test_03/./work_PR3_UNO_MPI_e_c                     (1 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2                     (15 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2                     (15 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2                     (19 files differ)
mww3_test_03/./work_PR2_UQ_MPI_d2                     (15 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c                     (17 files differ)
mww3_test_03/./work_PR2_UNO_MPI_e                     (1 files differ)
mww3_test_03/./work_PR3_UQ_MPI_e_c                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_e                     (1 files differ)
mww3_test_03/./work_PR2_UQ_MPI_e                     (1 files differ)
mww3_test_03/./work_PR1_MPI_e                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c                     (15 files differ)
mww3_test_09/./work_MPI_ASCII                     (0 files differ)
ww3_tp2.10/./work_MPI_OMPH                     (6 files differ)
ww3_tp2.16/./work_MPI_OMPH                     (4 files differ)
ww3_tp2.6/./work_ST4_ASCII                     (0 files differ)
ww3_ufs1.3/./work_a                     (3 files differ)

matrixCompFull.txt
matrixCompSummary.txt
matrixDiff.txt

[mingchen-NOAA]

Regression tests passed on Hercules GNU

**********************************************************************
********************* non-identical cases ****************************
**********************************************************************
mww3_test_03/./work_PR1_MPI_d2                     (17 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2                     (15 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2                     (15 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2                     (15 files differ)
mww3_test_03/./work_PR2_UQ_MPI_d2                     (17 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c                     (15 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c                     (13 files differ)
mww3_test_09/./work_MPI_ASCII                     (0 files differ)
ww3_tp2.10/./work_MPI_OMPH                     (7 files differ)
ww3_tp2.16/./work_MPI_OMPH                     (4 files differ)
ww3_tp2.6/./work_ST4_ASCII                     (0 files differ)
ww3_ts1/./work_ST4_WRT                     (1 files differ)
ww3_ufs1.3/./work_a                     (28 files differ)

matrixCompFull.txt
matrixCompSummary.txt
matrixDiff.txt

[mingchen-NOAA]

@ukmo-daisybrown The PR has been merged. Thank you very much!