CR

neuronsimulator · Dec 15, 2022 · 93d41fa · 93d41fa
1 parent d32bea1
commit 93d41fa
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/neuron-ci.yml b/.github/workflows/neuron-ci.yml
@@ -237,9 +237,11 @@ jobs:
                                 -Wno-unused-function \
                                 -Wno-unused-but-set-variable \
                                 -Wno-reorder \
-                                -Wno-sign-compare" \
-                             -DNRN_EXTRA_MECH_CXX_FLAGS="-Wno-sometimes-uninitialized \
-                                -Wno-missing-braces")
+                                -Wno-sign-compare \
+                                -Wno-strict-aliasing \
+                                -Wno-missing-braces \
+                                -Wno-mismatched-tags" \
+                             -DNRN_EXTRA_MECH_CXX_FLAGS="")
               fi
               mkdir build && cd build
               echo "Building with: ${cmake_args[@]}"

diff --git a/ci/win_install_deps.cmd b/ci/win_install_deps.cmd
@@ -48,7 +48,7 @@ copy "c:\Windows\SysWoW64\msmpi.dll" "c:\msmpi\lib\x86\msmpi.dll" || goto :error
 if "%MSYS2_ROOT%"=="" set MSYS2_ROOT=C:\msys64
 
 :: install msys2 / mingw packages.
-:: NOTE: msys2 is already installed in the CI VM image. We check if if msys2 is not installed, then download and install it with choco
+:: NOTE: msys2 is already installed in the CI VM image. We check if msys2 is not installed, then download and install it with choco
 if not exist "%MSYS2_ROOT%\usr\bin\bash.exe" (
     choco install -y --no-progress msys2 --params="/InstallDir:%MSYS2_ROOT% /NoUpdate /NoPath" || goto :error
 )

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -21,6 +21,7 @@ _Release Date_ : 15-12-2022
     - adapt scripts for local usage
   - added NMODL documentation in various constructs in hoc and python (#2011)
 - SETUPTOOLS_USE_DISTUTILS=stdlib (#1924)
+- Update CoreNEURON submodule to latest version
 
 For the complete list of commits, see the list in [GitHub Issue #2109](https://github.com/neuronsimulator/nrn/issues/2109)
 

diff --git a/docs/cmake_doc/options.rst b/docs/cmake_doc/options.rst
@@ -218,7 +218,7 @@ NRN_ENABLE_MUSIC:BOOL=OFF
   Enable MUSIC. MUlti SImulation Coordinator.
 
   MUSIC must already be installed. See https://github.com/INCF/MUSIC.
-  Hints for MUSIC installation: use the switch-to-MPI-C-interface branch.
+  Hints for MUSIC installation: at the time of 8.2.2 release (Dec 2022), one needs to use `switch-to-MPI-C-interface` branch of MUSIC repository.
   Python3 must have mpi4py and cython modules. I needed a PYTHON_PREFIX, so
   on my Apple M1 used: ``./configure --prefix=`pwd`/musicinstall PYTHON_PREFIX=/Library/Frameworks/Python.framework/Versions/3.11 --disable-anysource``
 

diff --git a/docs/hoc/modelspec/programmatic/mechanisms/nmodl.rst b/docs/hoc/modelspec/programmatic/mechanisms/nmodl.rst
@@ -930,7 +930,7 @@ FUNCTION_TABLE
 
 Description:
     This keyword defines function tables whose values are given by vectors prior to the simulation.
-    For example let's say we have the following declaration in a ΝMODΛ file:
+    For example let's say we have the following declaration in a ΝMODL file:
 
     .. code-block::
         none