fix(build): started bringing SERiF back up to speed with 4D-STAR C++
Some checks failed
Build and Test / build-and-test-ubuntu (ubuntu-24.04) (push) Has been cancelled
Some checks failed
Build and Test / build-and-test-ubuntu (ubuntu-24.04) (push) Has been cancelled
This commit is contained in:
@@ -36,11 +36,12 @@
|
||||
|
||||
|
||||
#include "helm.h"
|
||||
#include "const.h"
|
||||
#include "config.h"
|
||||
#include "fourdst/constants/const.h"
|
||||
#include "fourdst/config/config.h"
|
||||
#include "quill/LogMacros.h"
|
||||
#include "quill/Logger.h"
|
||||
#include "logging.h"
|
||||
#include "fourdst/logging/logging.h"
|
||||
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -127,10 +128,8 @@ namespace serif::eos::helmholtz {
|
||||
|
||||
// this function reads in the HELM table and stores in the above arrays
|
||||
std::unique_ptr<HELMTable> read_helm_table(const std::string &filename) {
|
||||
fourdst::config::Config& config = fourdst::config::Config::getInstance();
|
||||
auto logFile = config.get<std::string>("EOS:Helm:LogFile", "log");
|
||||
fourdst::logging::LogManager& logManager = fourdst::logging::LogManager::getInstance();
|
||||
quill::Logger* logger = logManager.getLogger(logFile);
|
||||
quill::Logger* logger = logManager.getLogger("log");
|
||||
LOG_INFO(logger, "read_helm_table : Reading HELM table from file {}", filename);
|
||||
|
||||
// Make a unique pointer to the HELMTable
|
||||
@@ -238,10 +237,8 @@ namespace serif::eos::helmholtz {
|
||||
and returns the calculated quantities in the input
|
||||
***/
|
||||
serif::eos::helmholtz::HELMEOSOutput get_helm_EOS(serif::eos::helmholtz::HELMEOSInput &q, const serif::eos::helmholtz::HELMTable &table) {
|
||||
fourdst::config::Config& config = fourdst::config::Config::getInstance();
|
||||
auto logFile = config.get<std::string>("EOS:Helm:LogFile", "log");
|
||||
fourdst::logging::LogManager& logManager = fourdst::logging::LogManager::getInstance();
|
||||
quill::Logger* logger = logManager.getLogger(logFile);
|
||||
quill::Logger* logger = logManager.getLogger("log");
|
||||
|
||||
fourdst::constant::Constants& constants = fourdst::constant::Constants::getInstance();
|
||||
const double pi = std::numbers::pi;
|
||||
|
||||
Reference in New Issue
Block a user