Skip to content

Commit

Permalink
Merge pull request #298 from DimitriPlotnikov/master
Browse files Browse the repository at this point in the history
Prepare bugfix release.
  • Loading branch information
Plotnikov authored Nov 1, 2016
2 parents 03b84da + e9274be commit 3770c07
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docker/DockerfileRelease
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN python setup.py install
# Define working directory.doc
RUN mkdir -p /data/nestml/target/
WORKDIR /data/nestml/target/
RUN wget https://github.com/nest/nestml/releases/download/1.3.0/nestml.jar
RUN wget https://github.com/nest/nestml/releases/download/1.3.1/nestml.jar

# Define default command.
# Entry point is constructed in the invoking script
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>nestml</groupId>
<artifactId>nestml-core</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>

<properties>
<!-- .. Libraries ..................................................... -->
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/org/nest/spl/GSLIntegrator.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
@param stateSize number of the step variables
@result TODO
-->

t = 0;
<#assign index = 0>
<#assign indexPostfix = "INDEX">
<#list body.variablesDefinedByODE() as odeVariable>
stateVector[${names.name(odeVariable)}_${indexPostfix}] = S_.${names.name(odeVariable)};
<#assign index = index + 1>
</#list>

while ( t < step_ )
{
const int status = gsl_odeiv_evolve_apply( B_.e_,
Expand Down

0 comments on commit 3770c07

Please sign in to comment.