Merge remote-tracking branch 'upstream/master' into gap_junctions

clinssen · Aug 9, 2023 · b6f37bd · b6f37bd
2 parents 98895b6 + 6e1c66e
commit b6f37bd
Show file tree

Hide file tree

Showing 40 changed files with 935 additions and 2,350 deletions.
diff --git a/.github/workflows/nestml-build.yml b/.github/workflows/nestml-build.yml
@@ -119,7 +119,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- nest_branch: ["v2.20.2", "v3.0", "v3.1", "v3.2", "v3.3", "v3.4", "master"]
+ nest_branch: ["v2.20.2", "v3.0", "v3.1", "v3.2", "v3.3", "v3.4", "v3.5", "master"]
  fail-fast: false
  steps:
  # Checkout the repository contents

diff --git a/README.md b/README.md
@@ -31,3 +31,11 @@ NESTML is free software: you can redistribute it and/or modify it under the term
 NESTML is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with NESTML. If not, see <http://www.gnu.org/licenses/>.
+
+## Acknowledgements
+
+This software was initially supported by the JARA-HPC Seed Fund *NESTML - A modeling language for spiking neuron and synapse models for NEST* and the Initiative and Networking Fund of the Helmholtz Association and the Helmholtz Portfolio Theme *Simulation and Modeling for the Human Brain*.
+
+This software was developed in part or in whole in the Human Brain Project, funded from the European Union's Horizon 2020 Framework Programme for Research and Innovation under Specific Grant Agreements No. 720270, No. 785907 and No. 945539 (Human Brain Project SGA1, SGA2 and SGA3).
+
+
diff --git a/doc/nestml_language/nestml_language_concepts.rst b/doc/nestml_language/nestml_language_concepts.rst
@@ -512,6 +512,21 @@ The following functions are predefined in NESTML and can be used out of the box:
  * - ``tanh``
  - x
  - Returns the hyperbolic tangent of x. The type of x and the return type are Real.
+ * - ``erf``
+ - x
+ - Returns the error function of x. The type of x and the return type are Real.
+ * - ``erfc``
+ - x
+ - Returns the complementary error function of x. The type of x and the return type are Real.
+ * - ``ceil``
+ - x
+ - Returns the ceil of x. The type of x and the return type are Real.
+ * - ``floor``
+ - x
+ - Returns the floor of x. The type of x and the return type are Real.
+ * - ``round``
+ - x
+ - Returns the rounded value of x. The type of x and the return type are Real.
  * - ``random_normal``
  - mean, std
  - Returns a sample from a normal (Gaussian) distribution with parameters "mean" and "standard deviation"

diff --git a/doc/tutorials/active_dendrite/nestml_active_dendrite_tutorial.ipynb b/doc/tutorials/active_dendrite/nestml_active_dendrite_tutorial.ipynb
diff --git a/doc/tutorials/izhikevich/nestml_izhikevich_tutorial.ipynb b/doc/tutorials/izhikevich/nestml_izhikevich_tutorial.ipynb
diff --git a/doc/tutorials/ornstein_uhlenbeck_noise/nestml_ou_noise_tutorial.ipynb b/doc/tutorials/ornstein_uhlenbeck_noise/nestml_ou_noise_tutorial.ipynb