Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

CORENRN_ENABLE_LEGACY_UNITS default OFF#408

Merged
pramodk merged 20 commits into
masterfrom
nrnunit-coreneuron
Nov 4, 2020
Merged

CORENRN_ENABLE_LEGACY_UNITS default OFF#408
pramodk merged 20 commits into
masterfrom
nrnunit-coreneuron

Conversation

@nrnhines

@nrnhines nrnhines commented Oct 26, 2020

Copy link
Copy Markdown
Collaborator

Consistency of units selection for NEURON and CoreNEURON checked
Modern units comes from copy of nrnunits-modern.h
eion.cpp nrn_nernst and nrn_ghk computes according to the units selection.

Partially responds to #405 and neuronsimulator/nrn#521
Interacts with neuronsimulator/nrn#793 and BlueBrain/mod2c#53

 Consistency of units selection for NEURON and CoreNEURON checked
 Modern units comes from copy of nrnunits-modern.h
 eion.cpp nrn_nernst and nrn_ghk computes according to the units selection.
Comment thread coreneuron/apps/main1.cpp Outdated
Comment thread coreneuron/io/global_vars.cpp Outdated
@pramodk pramodk force-pushed the nrnunit-coreneuron branch from f922d63 to 1a1dc81 Compare November 3, 2020 15:04
Comment thread CMakeLists.txt Outdated
endif()

if(CORENRN_ENABLE_LEGACY_UNITS)
set(CORENRN_UseLegacyUnits 1)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am changing CORENRN_UseLegacyUnits to CORENRN_USE_LEGACY_UNITS for naming consistency (i.e. not mixing _ and CamelCase.

@pramodk

pramodk commented Nov 4, 2020

Copy link
Copy Markdown
Collaborator
  • Jenkins Pipeline and Simulation Stack is going to fail because of bbcore_version is changed and also units default is changed.
  • Travis CI is not going to run fast because of Travis CI backlog.

Because of this I will go ahead with the merge of this PR. We will sychronise branches later for CI.

@pramodk pramodk left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pramodk pramodk merged commit f2120d3 into master Nov 4, 2020
@pramodk pramodk deleted the nrnunit-coreneuron branch November 4, 2020 23:29
pramodk pushed a commit to neuronsimulator/nrn that referenced this pull request Nov 2, 2022
* CORENRN_ENABLE_LEGACY_UNITS default OFF
   - Consistency of units selection for NEURON and CoreNEURON checked
   - Modern units comes from copy of nrnunits-modern.h
      eion.cpp nrn_nernst and nrn_ghk computes according to the units selection.
* Changed CORENRN_LegacyFR to CORENRN_ENABLE_LEGACY_UNITS
* inlined chk_nrnunit_consist
* mod2c_core built in ${CMAKE_BINARY_DIR}/bin
* update mod2c
* Update ring data to version 1.3
* set MOD2C_ENABLE_LEGACY_UNITS from CORENRN_ENABLE_LEGACY_UNITS
* Fix compilation issue for GPU build
  - use set_property with APPEND so that previous flags are not overridden

CoreNEURON Repo SHA: BlueBrain/CoreNeuron@f2120d3
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants