From d0c7b374c5c86e8fcbd9914ac43750ee8f1547eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asia=20J=C4=99drzejewska-Szmek?= <asia@in.waw.pl> Date: Fri, 20 Jan 2017 15:49:31 -0500 Subject: [PATCH] Add MMPump to scheduling and makefiles --- moose-core/biophysics/CMakeLists.txt | 1 + moose-core/biophysics/Makefile | 2 ++ moose-core/scheduling/Clock.cpp | 2 ++ 3 files changed, 5 insertions(+) diff --git a/moose-core/biophysics/CMakeLists.txt b/moose-core/biophysics/CMakeLists.txt index 133a5556..c36def8e 100644 --- a/moose-core/biophysics/CMakeLists.txt +++ b/moose-core/biophysics/CMakeLists.txt @@ -38,6 +38,7 @@ set(BIOPHYSICS_SRCS DifShell.cpp DifBufferBase.cpp DifBuffer.cpp + MMPump.cpp Leakage.cpp VectorTable.cpp MarkovRateTable.cpp diff --git a/moose-core/biophysics/Makefile b/moose-core/biophysics/Makefile index bc95b4d2..bdd2a109 100644 --- a/moose-core/biophysics/Makefile +++ b/moose-core/biophysics/Makefile @@ -42,6 +42,7 @@ OBJ = \ DifShell.o \ DifBufferBase.o \ DifBuffer.o \ + MMpump.o \ Leakage.o \ VectorTable.o \ MarkovRateTable.o \ @@ -101,6 +102,7 @@ DifShellBase.o: DifShellBase.h DifShell.o: DifShellBase.h DifShell.h DifBufferBase.o: DifBufferBase.h DifBuffer.o: DifBufferBase.h DifBuffer.h +MMPump.o: MMPump.h testBiophysics.o: IntFire.h CompartmentBase.h Compartment.h HHChannel.h HHGate.h VectorTable.o : VectorTable.h MarkovGslSolver.o : MarkovGslSolver.h diff --git a/moose-core/scheduling/Clock.cpp b/moose-core/scheduling/Clock.cpp index af8edb1f..3bba13b6 100644 --- a/moose-core/scheduling/Clock.cpp +++ b/moose-core/scheduling/Clock.cpp @@ -358,6 +358,7 @@ const Cinfo* Clock::initCinfo() " CaConcBase 1 50e-6\n" " DifShell 1 50e-6\n" " DifShellBase 1 50e-6\n" + " MMPump 1 50e-6\n" " DifBuffer 1 50e-6\n" " DifBufferBase 1 50e-6\n" " MgBlock 1 50e-6\n" @@ -843,6 +844,7 @@ void Clock::buildDefaultTick() defaultTick_["CaConcBase"] = 1; defaultTick_["DifShell"] = 1; defaultTick_["DifShellBase"] = 1; + defaultTick_["MMPump"] = 1; defaultTick_["DifBuffer"] = 1; defaultTick_["DifBufferBase"] = 1; defaultTick_["MgBlock"] = 1; -- GitLab