diff --git a/build/includes/job_actor/job_actor_subroutine_wrappers.hpp b/build/includes/job_actor/job_actor_subroutine_wrappers.hpp
index df66a121eccd367fdb5b4981aa1a1d14b3f0e042..794d937b3b1d1a3ea8c2313feb9a315948e8f85b 100644
--- a/build/includes/job_actor/job_actor_subroutine_wrappers.hpp
+++ b/build/includes/job_actor/job_actor_subroutine_wrappers.hpp
@@ -4,6 +4,8 @@ extern "C" {
void initGlobals(char const*str1, int* totalGRUs, int* totalHRUs,
int* numGRUs, int* numHRUs, int* startGRUIndex, int* err);
+ void setTimesDirsAndFiles(char const* file_manager, int* err);
+
void cleanUpJobActor(int* err);
}
\ No newline at end of file
diff --git a/build/makefile b/build/makefile
index 826cb4b493d0d5d39714bc11e23721a8dd216e34..8e3923e050e53a906c8e7830f0b7bf624a143c81 100644
--- a/build/makefile
+++ b/build/makefile
@@ -14,16 +14,16 @@ ACTORS_LIBRARIES = -L/usr/lib -L/usr/local/lib -L/Summa-Actors/bin -lcaf_core -l
# Production runs
-# FLAGS_NOAH = -O3 -ffree-form -ffree-line-length-none -fmax-errors=0 -fPIC -Wfatal-errors
-# FLAGS_COMM = -O3 -ffree-line-length-none -fmax-errors=0 -fPIC -Wfatal-errors
-# FLAGS_SUMMA = -O3 -ffree-line-length-none -fmax-errors=0 -fPIC -Wfatal-errors
-# FLAGS_ACTORS = -O3 -Wfatal-errors -std=c++17
+FLAGS_NOAH = -g -O3 -ffree-form -ffree-line-length-none -fmax-errors=0 -fPIC -Wfatal-errors
+FLAGS_COMM = -g -O3 -ffree-line-length-none -fmax-errors=0 -fPIC -Wfatal-errors
+FLAGS_SUMMA = -g -O3 -ffree-line-length-none -fmax-errors=0 -fPIC -Wfatal-errors
+FLAGS_ACTORS = -g -O3 -Wfatal-errors -std=c++17
# Debug runs
-FLAGS_NOAH = -g -O0 -ffree-form -ffree-line-length-none -fmax-errors=0 -fbacktrace -Wno-unused -Wno-unused-dummy-argument -fPIC
-FLAGS_COMM = -g -O0 -Wall -ffree-line-length-none -fmax-errors=0 -fbacktrace -fcheck=bounds -fPIC
-FLAGS_SUMMA = -g -O0 -Wall -ffree-line-length-none -fmax-errors=0 -fbacktrace -fcheck=bounds -fPIC
-FLAGS_ACTORS = -g -O0 -Wall -std=c++17
+# FLAGS_NOAH = -g -O0 -ffree-form -ffree-line-length-none -fmax-errors=0 -fbacktrace -Wno-unused -Wno-unused-dummy-argument -fPIC
+# FLAGS_COMM = -g -O0 -Wall -ffree-line-length-none -fmax-errors=0 -fbacktrace -fcheck=bounds -fPIC
+# FLAGS_SUMMA = -g -O0 -Wall -ffree-line-length-none -fmax-errors=0 -fbacktrace -fcheck=bounds -fPIC
+# FLAGS_ACTORS = -g -O0 -Wall -std=c++17
@@ -84,10 +84,13 @@ SUMMA_DATAMS= \
data_types.f90 \
globalData.f90 \
flxMapping.f90 \
- get_ixname.f90 \
+ get_ixname.f90
+DATAMS = $(patsubst %, $(DSHARE_DIR)/%, $(SUMMA_DATAMS))
+
+SUMMA_DEPEND_ON_FILEMANAGER= \
popMetadat.f90 \
outpt_stat.f90
-DATAMS = $(patsubst %, $(DSHARE_DIR)/%, $(SUMMA_DATAMS))
+DEPEND_ON_FILEMANAGER = $(patsubst %, $(DSHARE_DIR)/%, $(SUMMA_DEPEND_ON_FILEMANAGER))
# utility modules
SUMMA_UTILMS= \
@@ -136,6 +139,7 @@ SUMMA_INTERFACE= \
INTERFACE = $(patsubst %, $(ACTORS_DIR)/global/%, $(SUMMA_INTERFACE))
+
SUMMA_FILEACCESS_INTERFACE = \
initOutputStruc.f90 \
deallocateOutputStruc.f90 \
@@ -144,7 +148,8 @@ SUMMA_FILEACCESS_INTERFACE = \
FILEACCESS_INTERFACE = $(patsubst %, $(FILE_ACCESS_DIR)/%, $(SUMMA_FILEACCESS_INTERFACE))
SUMMA_JOB_INTERFACE = \
- cppwrap_job.f90
+ cppwrap_job.f90 \
+ job_actor.f90
JOB_INTERFACE = $(patsubst %, $(JOB_ACTOR_DIR)/%, $(SUMMA_JOB_INTERFACE))
@@ -218,7 +223,7 @@ SUMMA_NETCDF = \
NETCDF = $(patsubst %, $(NETCDF_DIR)/%, $(SUMMA_NETCDF))
# ... stitch together common programs
-COMM_ALL = $(NRUTIL) $(NRPROC) $(HOOKUP) $(DATAMS) $(UTILMS)
+COMM_ALL = $(NRUTIL) $(NRPROC) $(DATAMS) $(INTERFACE) $(HOOKUP) $(DEPEND_ON_FILEMANAGER) $(UTILMS)
# ... stitch together SUMMA programs
SUMMA_ALL = $(NETCDF) $(PRELIM) $(MODRUN) $(SOLVER)
@@ -310,7 +315,7 @@ compile_comm:
# compile SUMMA routines
compile_summa:
- $(FC) $(FLAGS_SUMMA) -c $(SUMMA_ALL) $(DRIVER) $(INTERFACE) $(JOB_INTERFACE) $(FILEACCESS_INTERFACE) $(HRU_INTERFACE) $(GRU_INTERFACE) $(INCLUDES)
+ $(FC) $(FLAGS_SUMMA) -c $(SUMMA_ALL) $(DRIVER) $(JOB_INTERFACE) $(FILEACCESS_INTERFACE) $(HRU_INTERFACE) $(GRU_INTERFACE) $(INCLUDES)
# generate library
link:
diff --git a/build/source/actors/job_actor/cppwrap_job.f90 b/build/source/actors/job_actor/cppwrap_job.f90
index 8ece46e9231f10f37655b5edfcffa77b11e38a7c..32cd7b28c730bcb93a9fc1242eabaa3ef67ee666 100644
--- a/build/source/actors/job_actor/cppwrap_job.f90
+++ b/build/source/actors/job_actor/cppwrap_job.f90
@@ -56,15 +56,15 @@ subroutine initGlobals(file_manager, totalGRUs, totalHRUs, numGRUs, numHRUs, sta
call c_f_string(file_manager, file_manager_path, 256)
! Conver the fileManager path to format needed for summa_SetTimesDirsAndFIles
- summaFileManagerFile = trim(file_manager_path)
+ ! summaFileManagerFile = trim(file_manager_path)
! set directories and files -- summaFileManager used as command-line argument
- call summa_SetTimesDirsAndFiles(summaFileManagerFile,err,cmessage)
- ! if(err/=0)then; message=trim(message)//trim(cmessage); return; endif;
- if(err/=0)then
- message=trim(message)//trim(cmessage)
- print*, cmessage
- return
- endif
+ ! call summa_SetTimesDirsAndFiles(summaFileManagerFile,err,cmessage)
+ ! ! if(err/=0)then; message=trim(message)//trim(cmessage); return; endif;
+ ! if(err/=0)then
+ ! message=trim(message)//trim(cmessage)
+ ! print*, cmessage
+ ! return
+ ! endif
! define global data (parameters, metadata)
call summa_defineGlobalData(err, cmessage)
diff --git a/build/source/actors/job_actor/job_actor.cpp b/build/source/actors/job_actor/job_actor.cpp
index 4d17d170e85e6fc8297ae626ffdf8f0b1cd63e47..cff2b4d1afbaec3fc51e0d4107a5963aec6b03f5 100644
--- a/build/source/actors/job_actor/job_actor.cpp
+++ b/build/source/actors/job_actor/job_actor.cpp
@@ -56,6 +56,11 @@ behavior job_actor(stateful_actor<job_state>* self, int startGRU, int numGRU,
}
// Initalize global variables
+ int err = 0;
+ setTimesDirsAndFiles(self->state.fileManager.c_str(), &err);
+ if (err != 0) {
+ aout(self) << "ERROR: Job_Actor - setTimesDirsAndFiles\n";
+ }
initJob(self);
// Spawn the file_access_actor. This will return the number of forcing files we are working with
@@ -132,11 +137,11 @@ behavior job_actor(stateful_actor<job_state>* self, int startGRU, int numGRU,
[=](done_file_access_actor_init) {
// Init GRU Actors and the Output Structure
- // self->send(self, init_hru_v);s
- auto gru = self->spawn(gru_actor, 1, 1,
- self->state.configPath,
- self->state.outputStrucSize, self);
- self->send(gru, init_gru_v);
+ self->send(self, init_hru_v);
+ // auto gru = self->spawn(gru_actor, 1, 1,
+ // self->state.configPath,
+ // self->state.outputStrucSize, self);
+ // self->send(gru, init_gru_v);
},
[=](file_access_actor_done, double read_duration, double write_duration) {
diff --git a/build/source/actors/job_actor/job_actor.f90 b/build/source/actors/job_actor/job_actor.f90
index 6aad13f1c5f94594d1836cbc268512f106f3d58c..4b8e28c1cc1dc8d0e7f6f4d01313b46e901c5ad3 100644
--- a/build/source/actors/job_actor/job_actor.f90
+++ b/build/source/actors/job_actor/job_actor.f90
@@ -1,5 +1,8 @@
module job_actor
-implicit none
+ implicit none
+
+
+ contains
diff --git a/build/source/hookup/summaActors_FileManager.f90 b/build/source/hookup/summaActors_FileManager.f90
index 041984fe422944b5a5fa490df1c25571f8195614..8183fc79adbc63916529280bd10fb50c2c372fd8 100755
--- a/build/source/hookup/summaActors_FileManager.f90
+++ b/build/source/hookup/summaActors_FileManager.f90
@@ -23,71 +23,80 @@
! (C) Copyright 2009-2010 --- Dmitri Kavetski and Martyn Clark --- All rights reserved
!******************************************************************
MODULE summaActors_FileManager
-use nrtype
-implicit none
-public
-! summa-wide pathlength
-integer(i4b),parameter :: summaPathLen=4096
-! defines the time of the run
-CHARACTER(LEN=summaPathLen) :: CONTROL_VRS = 'SUMMA_FILE_MANAGER_V3.0.0' ! control version
-CHARACTER(LEN=summaPathLen) :: SIM_START_TM = '2000-01-01 00:00' ! simulation start time
-CHARACTER(LEN=summaPathLen) :: SIM_END_TM = '2000-01-01 00:00' ! simulation end time
-CHARACTER(LEN=summaPathLen) :: NC_TIME_ZONE = 'utcTime' ! time zone info
-! defines the path for data files (and default values)
-CHARACTER(LEN=summaPathLen) :: SETTINGS_PATH = 'settings/' ! settings dir path
-CHARACTER(LEN=summaPathLen) :: STATE_PATH = '' ! state file / init. cond. dir path (if omitted, defaults
- ! to SETTINGS_PATH for input, OUTPATH for output)
-CHARACTER(LEN=summaPathLen) :: FORCING_PATH = 'forcing/default/' ! input_dir_path
-CHARACTER(LEN=summaPathLen) :: OUTPUT_PATH = 'output/default/' ! output_dir_path
-CHARACTER(LEN=summaPathLen) :: FORCING_FREQ = 'month' ! Frequency of forcing files (input)
-CHARACTER(LEN=summaPathLen) :: FORCING_START = '2000-01-01' ! Number of Forcing Files
-! define name of control files (and default values)
-CHARACTER(LEN=summaPathLen) :: M_DECISIONS = 'summa_zDecisions.txt' ! definition of model decisions
-CHARACTER(LEN=summaPathLen) :: OUTPUT_CONTROL = 'summa_zLocalModelVarMeta.txt' ! metadata for model variables
-CHARACTER(LEN=summaPathLen) :: LOCAL_ATTRIBUTES = 'summa_zLocalAttributes.txt' ! local attributes
-CHARACTER(LEN=summaPathLen) :: LOCALPARAM_INFO = 'summa_zLocalParamInfo.txt' ! default values and constraints for local model parameters
-CHARACTER(LEN=summaPathLen) :: BASINPARAM_INFO = 'summa_zBasinParamInfo.txt' ! default values and constraints for basin model parameters
-CHARACTER(LEN=summaPathLen) :: VEGPARM = 'VEGPARM.TBL' ! noah vegetation parameter table
-CHARACTER(LEN=summaPathLen) :: SOILPARM = 'SOILPARM.TBL' ! noah soil parameter table
-CHARACTER(LEN=summaPathLen) :: GENPARM = 'GENPARM.TBL' ! noah general parameter table
-CHARACTER(LEN=summaPathLen) :: MPTABLE = 'MPTABLE.TBL' ! noah mp parameter table
-CHARACTER(LEN=summaPathLen) :: FORCING_FILELIST = 'summa_zForcingFileList.txt' ! list of focing files for each HRU
-CHARACTER(LEN=summaPathLen) :: MODEL_INITCOND = 'summa_zInitialCond.txt' ! model initial conditions
-CHARACTER(LEN=summaPathLen) :: PARAMETER_TRIAL = 'summa_zParamTrial.txt' ! trial values for model parameters
-CHARACTER(LEN=summaPathLen) :: OUTPUT_PREFIX = 'summa_output_' ! prefix for the output file
-
-contains
+ USE, intrinsic :: iso_c_binding
+ use nrtype
+ implicit none
+ public
+ ! summa-wide pathlength
+ integer(i4b),parameter :: summaPathLen=4096
+ ! defines the time of the run
+ CHARACTER(LEN=summaPathLen) :: CONTROL_VRS = 'SUMMA_FILE_MANAGER_V3.0.0' ! control version
+ CHARACTER(LEN=summaPathLen) :: SIM_START_TM = '2000-01-01 00:00' ! simulation start time
+ CHARACTER(LEN=summaPathLen) :: SIM_END_TM = '2000-01-01 00:00' ! simulation end time
+ CHARACTER(LEN=summaPathLen) :: NC_TIME_ZONE = 'utcTime' ! time zone info
+ ! defines the path for data files (and default values)
+ CHARACTER(LEN=summaPathLen) :: SETTINGS_PATH = 'settings/' ! settings dir path
+ CHARACTER(LEN=summaPathLen) :: STATE_PATH = '' ! state file / init. cond. dir path (if omitted, defaults
+ ! to SETTINGS_PATH for input, OUTPATH for output)
+ CHARACTER(LEN=summaPathLen) :: FORCING_PATH = 'forcing/default/' ! input_dir_path
+ CHARACTER(LEN=summaPathLen) :: OUTPUT_PATH = 'output/default/' ! output_dir_path
+ CHARACTER(LEN=summaPathLen) :: FORCING_FREQ = 'month' ! Frequency of forcing files (input)
+ CHARACTER(LEN=summaPathLen) :: FORCING_START = '2000-01-01' ! Number of Forcing Files
+ ! define name of control files (and default values)
+ CHARACTER(LEN=summaPathLen) :: M_DECISIONS = 'summa_zDecisions.txt' ! definition of model decisions
+ CHARACTER(LEN=summaPathLen) :: OUTPUT_CONTROL = 'summa_zLocalModelVarMeta.txt' ! metadata for model variables
+ CHARACTER(LEN=summaPathLen) :: LOCAL_ATTRIBUTES = 'summa_zLocalAttributes.txt' ! local attributes
+ CHARACTER(LEN=summaPathLen) :: LOCALPARAM_INFO = 'summa_zLocalParamInfo.txt' ! default values and constraints for local model parameters
+ CHARACTER(LEN=summaPathLen) :: BASINPARAM_INFO = 'summa_zBasinParamInfo.txt' ! default values and constraints for basin model parameters
+ CHARACTER(LEN=summaPathLen) :: VEGPARM = 'VEGPARM.TBL' ! noah vegetation parameter table
+ CHARACTER(LEN=summaPathLen) :: SOILPARM = 'SOILPARM.TBL' ! noah soil parameter table
+ CHARACTER(LEN=summaPathLen) :: GENPARM = 'GENPARM.TBL' ! noah general parameter table
+ CHARACTER(LEN=summaPathLen) :: MPTABLE = 'MPTABLE.TBL' ! noah mp parameter table
+ CHARACTER(LEN=summaPathLen) :: FORCING_FILELIST = 'summa_zForcingFileList.txt' ! list of focing files for each HRU
+ CHARACTER(LEN=summaPathLen) :: MODEL_INITCOND = 'summa_zInitialCond.txt' ! model initial conditions
+ CHARACTER(LEN=summaPathLen) :: PARAMETER_TRIAL = 'summa_zParamTrial.txt' ! trial values for model parameters
+ CHARACTER(LEN=summaPathLen) :: OUTPUT_PREFIX = 'summa_output_' ! prefix for the output file
+
+ contains
! **************************************************************************************************
! public subroutine summa_SetTimesDirsAndFiles: Sets times, directories and filenames for summa run
! **************************************************************************************************
-subroutine summa_SetTimesDirsAndFiles(summaFileManagerIn,err,message)
+subroutine summa_SetTimesDirsAndFiles(file_manager,err) bind(C, name="setTimesDirsAndFiles")
! Purpose: Sets run times, directories and filenames for summa.
! ---
USE ascii_util_module,only:file_open ! function to open file
USE ascii_util_module,only:linewidth ! max character number for one line
USE ascii_util_module,only:get_vlines ! function to get a vector of non-comment lines
+ USE cppwrap_auxiliary,only:c_f_string
+
+
implicit none
! input/output vars
- character(*),intent(in) :: summaFileManagerIn
- integer(i4b),intent(out) :: err
- character(*),intent(out) :: message
+ character(kind=c_char,len=1),intent(in) :: file_manager
+ integer(i4b),intent(out) :: err
! local vars
- character(*),parameter :: summaFileManagerHeader='SUMMA_FILE_MANAGER_V3.0.0'
- integer(i4b),parameter :: runinfo_fileunit=67 ! file unit for run time information
- character(len=8) :: cdate
- character(len=10) :: ctime
- character(len=256) :: cmessage ! error message for downwind routine
- integer(i4b) :: unt ! file unit (free unit output from file_open)
- character(LEN=linewidth),allocatable :: charline(:) ! vector of character strings
- integer(i4b) :: iControl, nControl ! number of model info
- character(len=summaPathLen) :: varEntry ! name of model info
- character(len=32) :: option ! option for model info
+ character(len=256) :: summaFileManagerIn
+ character(len=256) :: message
+ character(*),parameter :: summaFileManagerHeader='SUMMA_FILE_MANAGER_V3.0.0'
+ integer(i4b),parameter :: runinfo_fileunit=67 ! file unit for run time information
+ character(len=8) :: cdate
+ character(len=10) :: ctime
+ character(len=256) :: cmessage ! error message for downwind routine
+ integer(i4b) :: unt ! file unit (free unit output from file_open)
+ character(LEN=linewidth),allocatable :: charline(:) ! vector of character strings
+ integer(i4b) :: iControl, nControl ! number of model info
+ character(len=summaPathLen) :: varEntry ! name of model info
+ character(len=32) :: option ! option for model info
err=0; message="summa_SetTimesDirsAndFiles/"
+ call c_f_string(file_manager, summaFileManagerIn, 256)
+ summaFileManagerIn = trim(summaFileManagerIn)
+
+
! read information from model control file, and populate model control structure
! populates global control information structure
diff --git a/utils/laugh_tests/celia1990/output/runinfo.txt b/utils/laugh_tests/celia1990/output/runinfo.txt
index 0b31f04567175e7e99cbf5ae5b9e8f327807b70f..89f0cb153cd578fc0b91240409ea479b1bd8d87a 100644
--- a/utils/laugh_tests/celia1990/output/runinfo.txt
+++ b/utils/laugh_tests/celia1990/output/runinfo.txt
@@ -1 +1 @@
- Run start time on system: ccyy=2022 - mm=08 - dd=18 - hh=16 - mi=51 - ss=11.619
+ Run start time on system: ccyy=2022 - mm=08 - dd=18 - hh=18 - mi=17 - ss=46.186
diff --git a/utils/laugh_tests/celia1990/output/summa-actors_celia1990GRU1-1_timestep.nc b/utils/laugh_tests/celia1990/output/summa-actors_celia1990GRU1-1_timestep.nc
index 0fb39e4297953022c8a5873cd1dcfe2bd1b056c9..d173a6235ac81f1f920965a1ab7d4091db3dcb0a 100644
Binary files a/utils/laugh_tests/celia1990/output/summa-actors_celia1990GRU1-1_timestep.nc and b/utils/laugh_tests/celia1990/output/summa-actors_celia1990GRU1-1_timestep.nc differ
diff --git a/utils/laugh_tests/colbeck1976/output/runinfo.txt b/utils/laugh_tests/colbeck1976/output/runinfo.txt
index 390c561e4cf795063e2f5bec9066ba19b30a6de8..075f6d671ed0ae18791b2493699ac89552e75266 100644
--- a/utils/laugh_tests/colbeck1976/output/runinfo.txt
+++ b/utils/laugh_tests/colbeck1976/output/runinfo.txt
@@ -1 +1 @@
- Run start time on system: ccyy=2022 - mm=08 - dd=16 - hh=21 - mi=31 - ss=26.957
+ Run start time on system: ccyy=2022 - mm=08 - dd=18 - hh=18 - mi=17 - ss=52.696
diff --git a/utils/laugh_tests/miller1998/output/millerSandGRU1-1_timestep.nc b/utils/laugh_tests/miller1998/output/millerSandGRU1-1_timestep.nc
index a11227dc290f563ca87bc949bf9c0a3550fb64a3..d836e77dc9f420b7aea5fcc29fe92e80cf8e879e 100644
Binary files a/utils/laugh_tests/miller1998/output/millerSandGRU1-1_timestep.nc and b/utils/laugh_tests/miller1998/output/millerSandGRU1-1_timestep.nc differ
diff --git a/utils/laugh_tests/miller1998/output/runinfo.txt b/utils/laugh_tests/miller1998/output/runinfo.txt
index 57d180b81da4d5169ffc62f88f3673fcef30e9a5..d09886784ffd73e775bb1b1b186633f37e91cd1d 100644
--- a/utils/laugh_tests/miller1998/output/runinfo.txt
+++ b/utils/laugh_tests/miller1998/output/runinfo.txt
@@ -1 +1 @@
- Run start time on system: ccyy=2022 - mm=08 - dd=16 - hh=21 - mi=32 - ss=00.868
+ Run start time on system: ccyy=2022 - mm=08 - dd=18 - hh=18 - mi=18 - ss=01.637
diff --git a/utils/laugh_tests/miller1998/run_test_summa_actors.sh b/utils/laugh_tests/miller1998/run_test_summa_actors.sh
index 864e583b8aa024e5655c409fd77279f2a00b6088..43659c6449ae6e32a974efb2c0e4abf31b9a91e0 100755
--- a/utils/laugh_tests/miller1998/run_test_summa_actors.sh
+++ b/utils/laugh_tests/miller1998/run_test_summa_actors.sh
@@ -1,5 +1,4 @@
#! /bin/bash
/Summa-Actors/bin/summaMain -g 1 -n 1 -c /Summa-Actors/utils/laugh_tests/miller1998/config/clay
-/Summa-Actors/bin/summaMain -g 1 -n 1 -c /Summa-Actors/utils/laugh_tests/miller1998/config/loam
-/Summa-Actors/bin/summaMain -g 1 -n 1 -c /Summa-Actors/utils/laugh_tests/miller1998/config/sand
\ No newline at end of file
+/Summa-Actors/bin/summaMain -g 1 -n 1 -c /Summa-Actors/utils/laugh_tests/miller1998/config/loam
\ No newline at end of file
diff --git a/utils/laugh_tests/mizoguchi1990/output/runinfo.txt b/utils/laugh_tests/mizoguchi1990/output/runinfo.txt
index 816ded9a32347f2ef8854d0783aa1d4fa704e0fa..f6212ae6443e608285dcff0f69d965ee2009c194 100644
--- a/utils/laugh_tests/mizoguchi1990/output/runinfo.txt
+++ b/utils/laugh_tests/mizoguchi1990/output/runinfo.txt
@@ -1 +1 @@
- Run start time on system: ccyy=2022 - mm=08 - dd=16 - hh=21 - mi=32 - ss=42.965
+ Run start time on system: ccyy=2022 - mm=08 - dd=18 - hh=18 - mi=18 - ss=11.308
diff --git a/utils/laugh_tests/run_all_summa_actors.sh b/utils/laugh_tests/run_all_summa_actors.sh
new file mode 100755
index 0000000000000000000000000000000000000000..92e1a8ef8fda6ebfc0f0e6662f59edb6ff9840bf
--- /dev/null
+++ b/utils/laugh_tests/run_all_summa_actors.sh
@@ -0,0 +1,31 @@
+#! /bin/bash
+
+echo "Starting Celia"
+cd celia1990
+./run_test_summa_actors.sh
+python3 verify_celia.py
+cd ..
+
+echo "Starting Colbeck"
+cd colbeck1976
+./run_test_summa_actors.sh
+python3 verify_colbeck.py
+cd ..
+
+echo "Starting Miller"
+cd miller1998
+./run_test_summa_actors.sh
+python3 verify_miller.py
+cd ..
+
+echo "Starting Mizoguchi"
+cd mizoguchi1990
+./run_test_summa_actors.sh
+python3 verify_mizoguchi.py
+cd ..
+
+echo "Starting Vanderborght"
+cd vanderborght2005
+./run_test_summa_actors.sh
+python3 verify_vanderborght.py
+cd ..
\ No newline at end of file
diff --git a/utils/laugh_tests/vanderborght2005/output/runinfo.txt b/utils/laugh_tests/vanderborght2005/output/runinfo.txt
index 5151e7cd7c083f6e6f2ec66c000ccd868bb86520..9010eb2b4f402fbb25cfbb18b14c8537313b8432 100644
--- a/utils/laugh_tests/vanderborght2005/output/runinfo.txt
+++ b/utils/laugh_tests/vanderborght2005/output/runinfo.txt
@@ -1 +1 @@
- Run start time on system: ccyy=2022 - mm=08 - dd=16 - hh=21 - mi=33 - ss=47.978
+ Run start time on system: ccyy=2022 - mm=08 - dd=18 - hh=18 - mi=18 - ss=43.832