Commit 433a2237 authored by CD's avatar CD
Browse files

Fixed issue with ICS files (were for old version of model before Circadian Rhythm changes

parent a0d7bb01
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# Port settings for ACT-R server started at 13:24:19 8/26/2020 # Port settings for ACT-R server started at 16:14:14 8/26/2020
set actr_port 2650 set actr_port 2650
set actr_address "192.168.1.62" set actr_address "192.168.1.79"
...@@ -497,7 +497,9 @@ t) ...@@ -497,7 +497,9 @@ t)
(while (probe-file solverInputFile)) (while (probe-file solverInputFile))
(when (wait-delete-output SolverOutputFile 5) (go resetCreate)) (when (wait-delete-output SolverOutputFile 5) (go resetCreate))
;; Initialize with stable values (default is obtained from running sim 1 week) ;; Initialize with stable values (default is obtained from running sim 1 week)
(format t "Loading ICS!~&")
(load-HumMod-ICs (phys-module-ics-file phys)) (load-HumMod-ICs (phys-module-ics-file phys))
(format t "Done!~&")
;(sleep 0.05) ;(sleep 0.05)
;Create input file for hummod to give us a list of variables and digest the output file created by HumMod (w/ the variables). Loop back around if there is an error ;Create input file for hummod to give us a list of variables and digest the output file created by HumMod (w/ the variables). Loop back around if there is an error
...@@ -649,17 +651,12 @@ t) ...@@ -649,17 +651,12 @@ t)
(let ((events (meta-p-events (current-mp))) (let ((events (meta-p-events (current-mp)))
(lastTime nil)) (lastTime nil))
(dolist (event events (length events)) (dolist (event events (length events))
(print "ERERERERERERRRRR~&~&")
(dolist (module moduleList (length moduleList)) (dolist (module moduleList (length moduleList))
(print "2222222222~&~&") (when (or (eq (act-r-event-module event) module)
(print (evt-module event)) (eq (act-r-event-module event) 'NONE))
(print "444")
(when (or (eq (evt-module event) module)
(eq (evt-module event) 'NONE))
(print "33333333~&~&")
(if (or (eq lastTime nil) (if (or (eq lastTime nil)
(> (evt-time event) lastTime)) (> (* (act-r-event-mstime event) 0.001) lastTime))
(setf lastTime (evt-time event)) (setf lastTime (* (act-r-event-mstime event) 0.001))
)))) ))))
(if lastTime (if lastTime
lastTime lastTime
...@@ -717,6 +714,7 @@ t) ...@@ -717,6 +714,7 @@ t)
(tagbody startGetVals (tagbody startGetVals
(while (probe-file solverOutputFile) (while (probe-file solverOutputFile)
(handler-case (delete-file solverOutputFile) (error () nil))) (handler-case (delete-file solverOutputFile) (error () nil)))
(format t "723...~&")
;;Get new HumMod value list ;;Get new HumMod value list
(handler-case (handler-case
(with-open-file (with-open-file
...@@ -724,6 +722,7 @@ t) ...@@ -724,6 +722,7 @@ t)
:direction :output :if-exists :overwrite :if-does-not-exist :create) :direction :output :if-exists :overwrite :if-does-not-exist :create)
(format messageStream getValsMessage)) ((or simple-error (or file-error)) (format messageStream getValsMessage)) ((or simple-error (or file-error))
() (go startGetVals))) () (go startGetVals)))
(format t "731...~&")
;wait for HumMod to digest input file ;wait for HumMod to digest input file
(let ((startTime (get-universal-time))) (let ((startTime (get-universal-time)))
......
<solverin><restart/></solverin>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment