(cherry picked from commit d6994f7)

(cherry picked from commit 9882289)

Use baset_latvary parameters

Namelist parameters baset_latvary_slope and baset_latvary_intercept were never actually used, with values of 0.4 and 12 being hard-coded in the relevant subroutine instead. This PR fixes that, and also adds unit testing of a refactored function that uses them.

(cherry picked from commit a4eff78)

 Conflicts:
	bld/namelist_files/namelist_defaults_ctsm.xml

(cherry picked from commit 4e09130)

 Conflicts:
	cime_config/testdefs/ExpectedTestFails.xml

(cherry picked from commit b916d38)

(cherry picked from commit 863ed22)

… the PEM test that is no longer needed and doesn't have a testmod for it

(cherry picked from commit 04853a8)

(cherry picked from commit 88ac3ae)

…30np4.pg3 landuse.timeseries file

(cherry picked from commit d3a82a5)

 Conflicts:
	bld/namelist_files/namelist_defaults_ctsm.xml

(cherry picked from commit 1a09d07)

 Conflicts:
	cime_config/testdefs/testmods_dirs/clm/ciso_decStartNoMeier/user_nl_clm

Use baset_latvary parameters

Namelist parameters baset_latvary_slope and baset_latvary_intercept were never actually used, with values of 0.4 and 12 being hard-coded in the relevant subroutine instead. This PR fixes that, and also adds unit testing of a refactored function that uses them.

…ce it was created with ctsm5.2 datasets

…p is required because the finidat file is based on ctsm5.2 datasets

…for non ctsm5.2 surface datasets

Use baset_latvary parameters

Namelist parameters baset_latvary_slope and baset_latvary_intercept were never actually used, with values of 0.4 and 12 being hard-coded in the relevant subroutine instead. This PR fixes that, and also adds unit testing of a refactored function that uses them.

…ith options per machine to options after machine lists, and add intel-oneapi and nvhpc tests to test lists with clm_short

…p usersmod

Do not use Meier roughness by default, even with 5.1

ctsm5.1.dev155 had turned on Meier2022 surface roughness calculation by default for 5.1 compsets. Several bugs have recently emerged that were not caught by pre-merge testing, so this tag reverts that change. Thus, the ZengWang2007 method is default for all compsets again.

…ren't in Cheyenne, and remove the intel-oneapi tests since they fail

Do not use Meier roughness by default, even with 5.1

ctsm5.1.dev155 had turned on Meier2022 surface roughness calculation by default for 5.1 compsets. Several bugs have recently emerged that were not caught by pre-merge testing, so this tag reverts that change. Thus, the ZengWang2007 method is default for all compsets again.

… before and the other from Derecho

…ected to fail

… different systems, as well as adding Derecho

…n't working as conda and module is not available in my default shell

…lving most of ESCOMP#2196

Do not use Meier roughness by default, even with 5.1

ctsm5.1.dev155 had turned on Meier2022 surface roughness calculation by default for 5.1 compsets. Several bugs have recently emerged that were not caught by pre-merge testing, so this tag reverts that change. Thus, the ZengWang2007 method is default for all compsets again.

Update Externals.cfg to work on Derecho

Update Externals.cfg to work on Derecho

Use baset_latvary parameters

Namelist parameters baset_latvary_slope and baset_latvary_intercept were never actually used, with values of 0.4 and 12 being hard-coded in the relevant subroutine instead. This PR fixes that, and also adds unit testing of a refactored function that uses them.

… CTSM5.1

…0np4.pg3 work around isn't needed, this fixes ESCOMP#2268

…ares-Oct2023 which resolves ESCOMP#2282

…put these files

…5_0_cam6 f09 files

Merging dev157

…_data_fix

… subset_data_fix

Resolved conflicts:
python/ctsm/site_and_regional/run_neon.py

…data_fix

…t_data_fix

…set_data_fix

First tag with PE layouts and testing for Derecho

Resolved conflicts:
.git-blame-ignore-revs

This reverts commit bb536ed.
First of 3 expected reverts.

…o pass"

This reverts commit ff02bad.
Second of 3 expected reverts.