Merge remote-tracking branch 'escomp/b4b-dev' into zendersource_dev

.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":

lilac/src/lilac_mod.F90

@@ -8,7 +8,6 @@ module lilac_mod
 
   ! External libraries
   use ESMF
-  use mct_mod        , only : mct_world_init
 
   ! shr code routines
   use shr_sys_mod   , only : shr_sys_abort
@@ -146,10 +145,7 @@ subroutine lilac_init2(mpicom, atm_global_index, atm_lons, atm_lats, &
     integer, parameter          :: debug = 1   !-- internal debug level
     character(len=*), parameter :: subname=trim(modname)//': [lilac_init] '
 
-    ! initialization of mct and pio
-    integer           :: ncomps = 1                 ! for mct
-    integer, pointer  :: mycomms(:)                 ! for mct
-    integer, pointer  :: myids(:)                   ! for mct
+    ! initialization of pio
     integer           :: compids(1) = (/1/)         ! for pio_init2 - array with component ids
     character(len=32) :: compLabels(1) = (/'LND'/)  ! for pio_init2
     character(len=64) :: comp_name(1) = (/'LND'/)   ! for pio_init2
@@ -220,14 +216,6 @@ subroutine lilac_init2(mpicom, atm_global_index, atm_lons, atm_lats, &
     call ESMF_VMGet(vm, localPet=mytask,  rc=rc)
     if (chkerr(rc,__LINE__,u_FILE_u)) return
 
-    !-------------------------------------------------------------------------
-    ! Initialize MCT (this is needed for data model functionality)
-    !-------------------------------------------
-    allocate(mycomms(1), myids(1))
-    mycomms = (/mpicom/) ; myids = (/1/)
-    call mct_world_init(ncomps, mpicom, mycomms, myids)
-    call ESMF_LogWrite(subname//"initialized mct ...  ", ESMF_LOGMSG_INFO)
-
     !-------------------------------------------------------------------------
     ! Initialize PIO with second initialization
     !-------------------------------------------------------------------------

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