Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arbor
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Analyze
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
arbor-sim
arbor
Commits
43d5ce05
Unverified
Commit
43d5ce05
authored
6 years ago
by
Sam Yates
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add exception for cross-group GJ error. (#686)
parent
2dc9520e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
arbor/arbexcept.cpp
+8
-3
8 additions, 3 deletions
arbor/arbexcept.cpp
arbor/include/arbor/arbexcept.hpp
+7
-0
7 additions, 0 deletions
arbor/include/arbor/arbexcept.hpp
arbor/mc_cell_group.cpp
+1
-2
1 addition, 2 deletions
arbor/mc_cell_group.cpp
with
16 additions
and
5 deletions
arbor/arbexcept.cpp
+
8
−
3
View file @
43d5ce05
...
...
@@ -26,11 +26,16 @@ bad_probe_id::bad_probe_id(cell_member_type probe_id):
probe_id
(
probe_id
)
{}
gj_unsupported_domain_decomposition
::
gj_unsupported_domain_decomposition
(
cell_gid_type
gid_0
,
cell_gid_type
gid_1
)
:
arbor_exception
(
pprintf
(
"No support for gap junctions across domain decomposition groups for gid {} and {}"
,
gid_0
,
gid_1
)),
gid_0
(
gid_0
),
gid_1
(
gid_1
)
{}
gj_kind_mismatch
::
gj_kind_mismatch
(
cell_gid_type
gid_0
,
cell_gid_type
gid_1
)
:
arbor_exception
(
pprintf
(
"Cells on gid {} and {} connected via gap junction have different cell kinds"
,
gid_0
,
gid_1
)),
gid_0
(
gid_0
),
gid_1
(
gid_1
)
arbor_exception
(
pprintf
(
"Cells on gid {} and {} connected via gap junction have different cell kinds"
,
gid_0
,
gid_1
)),
gid_0
(
gid_0
),
gid_1
(
gid_1
)
{}
bad_event_time
::
bad_event_time
(
time_type
event_time
,
time_type
sim_time
)
:
...
...
This diff is collapsed.
Click to expand it.
arbor/include/arbor/arbexcept.hpp
+
7
−
0
View file @
43d5ce05
...
...
@@ -50,6 +50,13 @@ struct gj_kind_mismatch: arbor_exception {
cell_gid_type
gid_0
,
gid_1
;
};
// Domain decomposition errors:
struct
gj_unsupported_domain_decomposition
:
arbor_exception
{
gj_unsupported_domain_decomposition
(
cell_gid_type
gid_0
,
cell_gid_type
gid_1
);
cell_gid_type
gid_0
,
gid_1
;
};
// Simulation errors:
struct
bad_event_time
:
arbor_exception
{
...
...
This diff is collapsed.
Click to expand it.
arbor/mc_cell_group.cpp
+
1
−
2
View file @
43d5ce05
...
...
@@ -90,8 +90,7 @@ void mc_cell_group::generate_deps_gids(const recipe& rec, std::vector<cell_gid_t
throw
bad_cell_description
(
cell_kind
::
cable1d_neuron
,
g
);
if
(
!
gid_to_loc
.
count
(
peer
))
{
// actually an error in the domain decomposition...
throw
bad_cell_description
(
cell_kind
::
cable1d_neuron
,
g
);
throw
gj_unsupported_domain_decomposition
(
g
,
peer
);
}
if
(
!
visited
.
count
(
peer
))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment