Changeset 28033 in project

Timestamp:

01/04/13 07:56:09 (8 years ago)

Author:

Ivan Raikov

Message:

nemo: added several variants of membrane potential equation

Location:

release/4/nemo/trunk

Files:

• examples/AKP06 (deleted)
• examples/Khaliq03 (deleted)
• nemo-matlab.scm (modified) (2 diffs)
• nemo-nest.scm (modified) (2 diffs)
• nemo.setup (modified) (1 diff)

release/4/nemo/trunk/nemo-matlab.scm

@@ -785 +785 @@
              (i-gates       (lookup-def 'i-gates gate-complex-info))
 
-             (capcomp       (any (match-lambda ((name 'membrane-capacitance id) (list name id)) (else #f)) components))
-             (mcap          (and capcomp (car ((dis 'component-exports) sys (cid capcomp)))))
+             (comprc         (any (match-lambda ((name 'membrane-tau id) (list name id)) (else #f)) components))
+             (mrc            (and comprc (car ((dis 'component-exports) sys (cid comprc)))))
                 
-             (rcomp           (any (match-lambda ((name 'membrane-resistance id) (list name id)) (else #f)) components))
-             (mres            (and rcomp (car ((dis 'component-exports) sys (cid rcomp)))))
-                
-             (rarea           (any (match-lambda ((name 'membrane-area id) (list name id)) (else #f)) components))
-             (marea           (and rarea (car ((dis 'component-exports) sys (cid rarea)))))
-                
-
+             (areacomp        (any (match-lambda ((name 'membrane-area id) (list name id)) (else #f)) components))
+             (marea           (and areacomp (car ((dis 'component-exports) sys (cid areacomp)))))
 
              (i-eqs (filter-map
@@ -956 +951 @@
 
 
-             (v-eq    (cond ((and mcap mres marea (member 'v globals) (not (null? i-names)))
-                             (list 'v (rhsexpr/MATLAB `(/ (* (neg ,(sum i-names)) ,marea) (* 2. ,mres ,mcap)))))
-                            ((and marea (member 'v globals) (not (null? i-names)))
-                             (list 'v (rhsexpr/MATLAB `(* (neg ,(sum i-names)) ,marea))))
-                            ((and (member 'v globals) (not (null? i-names)))
-                             (list 'v (rhsexpr/MATLAB `(neg ,(sum i-names)))))
-                            (else #f)))
-
+             (v-eq    (and (member 'v globals) (not (null? i-names))
+                           (cond ((and mrc marea)
+                                  (list 'v (rhsexpr/MATLAB `(/ (* (neg ,(sum i-names)) ,marea) ,mrc))))
+                                 (marea
+                                  (list 'v (rhsexpr/MATLAB `(* (neg ,(sum i-names)) ,marea))))
+                                 (mrc
+                                  (list 'v (rhsexpr/MATLAB `(/ (neg ,(sum i-names)) ,mrc))))
+                                 (else
+                                  (list 'v (rhsexpr/MATLAB `(neg ,(sum i-names)))))
+                                 )))
              
              (state-index-map  (let ((acc (fold (lambda (def ax)

release/4/nemo/trunk/nemo-nest.scm

@@ -2108 +2108 @@
              (i-gates         (lookup-def 'i-gates gate-complex-info))
 
-             (capcomp         (any (match-lambda ((name 'membrane-capacitance id) (list name id)) (else #f)) components))
-             (mcap            (and capcomp (car ((dis 'component-exports) sys (cid capcomp)))))
+             (comprc         (any (match-lambda ((name 'membrane-tau id) (list name id)) (else #f)) components))
+             (mrc            (and comprc (car ((dis 'component-exports) sys (cid comprc)))))
                 
-             (rcomp           (any (match-lambda ((name 'membrane-resistance id) (list name id)) (else #f)) components))
-             (mres            (and rcomp (car ((dis 'component-exports) sys (cid rcomp)))))
-                
-             (rarea           (any (match-lambda ((name 'membrane-area id) (list name id)) (else #f)) components))
-             (marea           (and rarea (car ((dis 'component-exports) sys (cid rarea)))))
+             (areacomp        (any (match-lambda ((name 'membrane-area id) (list name id)) (else #f)) components))
+             (marea           (and areacomp (car ((dis 'component-exports) sys (cid areacomp)))))
                 
              (i-eqs (filter-map
@@ -2273 +2270 @@
                                                        (* (neg ,(sum i-names)) ,marea)))))
                             (else (list 'v 0.0))))
+
+             (v-eq    (and (member 'v globals) (not (null? i-names))
+                           (let ((istim "(node.B_.I_stim_)" )) 
+                             (cond ((and mrc marea)
+                                    (list 'v (rhsexpr/C++ `(/ (+ ,istim (* (neg ,(sum i-names)) ,marea)) ,mrc))))
+                                   (marea
+                                    (list 'v (rhsexpr/C++ `(+ istim (* (neg ,(sum i-names)) ,marea)))))
+                                   (mrc
+                                    (list 'v (rhsexpr/C++ `(/ (+ istim (neg ,(sum i-names))) ,mrc))))
+                                   (else
+                                    (list 'v (rhsexpr/C++ `(+istim (neg ,(sum i-names))))))
+                                   ))))
 
              

release/4/nemo/trunk/nemo.setup

@@ -4 +4 @@
   (make-pathname #f fn ##sys#load-dynamic-extension))   
 
-(define nemo-version 8.0)
+(define nemo-version 8.1)
 
 (use make)