Merge pull request #2363 from TeaganKing/towerclass

Refactoring of neon_site into `tower_site` and `neon_site`

.git-blame-ignore-revs

@@ -31,3 +31,4 @@ d866510188d26d51bcd6d37239283db690af7e82
 183fc26a6691bbdf87f515dc47924a64be3ced9b
 6fccf682eaf718615407d9bacdd3903b8786a03d
 2500534eb0a83cc3aff94b30fb62e915054030bf
+78d05967c2b027dc9776a884716597db6ef7f57c

.gitignore

@@ -111,6 +111,7 @@ unit_test_build
 /tools/site_and_regional/????.ad/
 /tools/site_and_regional/????.postad/
 /tools/site_and_regional/????.transient/
+/tools/site_and_regional/archive/
 
 # build output
 *.o

cime_config/buildnml

@@ -144,8 +144,8 @@ def buildnml(case, caseroot, compname):
                 or clm_usrdat_name is "NEON.PRISM"
             ):
                 logger.warning(
-                    "WARNING: Do you have approriprate initial conditions for this simulation?"
-                    + " Check that the finidat file used in the lnd_in namelist is apprporiately spunup for your case"
+                    "WARNING: Do you have appropriate initial conditions for this simulation?"
+                    + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case"
                 )
 
     if comp_atm != "datm":

python/Makefile

@@ -28,6 +28,10 @@ PYLINT_SRC = \
 #       ../cime_config/buildnml
 
 all: test black lint
+# ----------------------------------------------------------------
+# See the stest target about this issue
+	@echo "Run './run_ctsm_py_tests --sys' by hand afterwards"
+# ----------------------------------------------------------------
 	@echo
 	@echo
 	@echo "Successfully ran all standard tests"
@@ -40,7 +44,14 @@ utest: FORCE
 
 .PHONY: stest
 stest: FORCE
-	$(PYTHON) ./run_ctsm_py_tests $(TEST_ARGS) --sys
+# ----------------------------------------------------------------
+# EBK 2024-03-19: Comment out running here because of this issue:
+# https://github.com/ESCOMP/CTSM/pull/2363#issuecomment-1967884908
+#$(PYTHON) ./run_ctsm_py_tests $(TEST_ARGS) --sys
+# Instead run by hand which seems to be working for now...
+# ----------------------------------------------------------------
+	@echo "System tests currently don't run under Make so..."
+	@echo "Run './run_ctsm_py_tests --sys' by hand afterwards"
 
 .PHONY: lint
 lint: FORCE