diff --git a/CMakeLists.txt b/CMakeLists.txt index 98a96282..12000d20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,8 @@ message(STATUS "Git revision: ${HERMES_REVISION}") option(HERMES_BUILD_BOUT "Build BOUT++ in external/BOUT-dev" ON) if(HERMES_BUILD_BOUT) set(BOUT_BUILD_EXAMPLES, OFF) # Don't create example makefiles - add_subdirectory(external/BOUT-dev) + set(HERMES_BOUT_SRC "external/BOUT-dev" CACHE STRING "Directory of BOUT++ dir") + add_subdirectory(${HERMES_BOUT_SRC} ${CMAKE_CURRENT_BINARY_DIR}/external/BOUT-dev) else() find_package(bout++ REQUIRED) endif() diff --git a/src/evolve_pressure.cxx b/src/evolve_pressure.cxx index 38f1e9f4..265cf20a 100644 --- a/src/evolve_pressure.cxx +++ b/src/evolve_pressure.cxx @@ -432,7 +432,7 @@ void EvolvePressure::outputVars(Options& state) { set_with_attrs(state[std::string("kappa_par_") + name], kappa_par, {{"time_dimension", "t"}, {"units", "W / m / eV"}, - {"conversion", Pnorm * Omega_ci * SQ(rho_s0)}, + {"conversion", (Pnorm * Omega_ci * SQ(rho_s0) )/ Tnorm}, {"long_name", name + " heat conduction coefficient"}, {"species", name}, {"source", "evolve_pressure"}});