Move solver code into own folder. (nw)

This commit is contained in:
couriersud 2015-06-19 18:33:14 +02:00
parent 57ce24e0df
commit a68161ee27
20 changed files with 34 additions and 33 deletions

View File

@ -3,8 +3,8 @@
#include "netlist/devices/nld_system.h"
#include "netlist/analog/nld_bjt.h"
#define USE_FRONTIERS 0
#define USE_FIXED_STV 0
#define USE_FRONTIERS 1
#define USE_FIXED_STV 1
NETLIST_START(dummy)
SOLVER(Solver, 12000)

View File

@ -55,18 +55,20 @@ project "netlist"
MAME_DIR .. "src/emu/netlist/analog/nld_bjt.h",
MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.c",
MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.h",
MAME_DIR .. "src/emu/netlist/analog/nld_solver.c",
MAME_DIR .. "src/emu/netlist/analog/nld_solver.h",
MAME_DIR .. "src/emu/netlist/analog/nld_switches.c",
MAME_DIR .. "src/emu/netlist/analog/nld_switches.h",
MAME_DIR .. "src/emu/netlist/analog/nld_twoterm.c",
MAME_DIR .. "src/emu/netlist/analog/nld_twoterm.h",
MAME_DIR .. "src/emu/netlist/analog/nld_opamps.c",
MAME_DIR .. "src/emu/netlist/analog/nld_opamps.h",
MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct.h",
MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct1.h",
MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct2.h",
MAME_DIR .. "src/emu/netlist/analog/nld_ms_gauss_seidel.h",
MAME_DIR .. "src/emu/netlist/solver/nld_solver.c",
MAME_DIR .. "src/emu/netlist/solver/nld_solver.h",
MAME_DIR .. "src/emu/netlist/solver/nld_ms_direct.h",
MAME_DIR .. "src/emu/netlist/solver/nld_ms_direct1.h",
MAME_DIR .. "src/emu/netlist/solver/nld_ms_direct2.h",
MAME_DIR .. "src/emu/netlist/solver/nld_ms_sor.h",
MAME_DIR .. "src/emu/netlist/solver/nld_ms_sor_math.h",
MAME_DIR .. "src/emu/netlist/solver/nld_ms_gmres.h",
MAME_DIR .. "src/emu/netlist/devices/nld_4020.c",
MAME_DIR .. "src/emu/netlist/devices/nld_4020.h",
MAME_DIR .. "src/emu/netlist/devices/nld_4066.c",

View File

@ -5,9 +5,9 @@
*
*/
#include <solver/nld_solver.h>
#include "nld_bjt.h"
#include "../nl_setup.h"
#include "nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()

View File

@ -5,9 +5,9 @@
*
*/
#include <solver/nld_solver.h>
#include "nld_fourterm.h"
#include "../nl_setup.h"
#include "nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()

View File

@ -5,10 +5,10 @@
*
*/
#include <solver/nld_solver.h>
#include <algorithm>
#include "nld_twoterm.h"
#include "nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()

View File

@ -57,10 +57,10 @@
#include "../analog/nld_bjt.h"
#include "../analog/nld_fourterm.h"
#include "../analog/nld_solver.h"
#include "../analog/nld_switches.h"
#include "../analog/nld_twoterm.h"
#include "../analog/nld_opamps.h"
#include "../solver/nld_solver.h"
#include "nld_legacy.h"

View File

@ -5,9 +5,9 @@
*
*/
#include <solver/nld_solver.h>
#include "nld_ne555.h"
#include "../nl_setup.h"
#include "../analog/nld_solver.h"
#define R_OFF (1E20)
#define R_ON (25) // Datasheet states a maximum discharge of 200mA, R = 5V / 0.2

View File

@ -5,8 +5,8 @@
*
*/
#include <solver/nld_solver.h>
#include "nld_system.h"
#include "../analog/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()

View File

@ -5,6 +5,7 @@
*
*/
#include <solver/nld_solver.h>
#include <cstring>
#include <algorithm>
#include <cstdio>
@ -13,7 +14,6 @@
#include "nl_base.h"
#include "devices/nld_system.h"
#include "analog/nld_solver.h"
#include "nl_util.h"
const netlist::netlist_time netlist::netlist_time::zero = netlist::netlist_time::from_raw(0);

View File

@ -5,6 +5,7 @@
*
*/
#include <solver/nld_solver.h>
#include <cstdio>
#include "plib/palloc.h"
@ -15,7 +16,6 @@
#include "nl_factory.h"
#include "devices/net_lib.h"
#include "devices/nld_system.h"
#include "analog/nld_solver.h"
#include "analog/nld_twoterm.h"
static NETLIST_START(base)

View File

@ -10,7 +10,7 @@
#include <algorithm>
#include "nld_solver.h"
#include "../solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()

View File

@ -8,8 +8,8 @@
#ifndef NLD_MS_DIRECT1_H_
#define NLD_MS_DIRECT1_H_
#include "nld_solver.h"
#include "nld_ms_direct.h"
#include "../solver/nld_ms_direct.h"
#include "../solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()

View File

@ -8,8 +8,8 @@
#ifndef NLD_MS_DIRECT2_H_
#define NLD_MS_DIRECT2_H_
#include "nld_solver.h"
#include "nld_ms_direct.h"
#include "../solver/nld_ms_direct.h"
#include "../solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()

View File

@ -14,11 +14,10 @@
#include <algorithm>
#include "nld_solver.h"
#include "nld_ms_direct.h"
#include "mat_cr.h"
#include "vector_base.h"
#include "../solver/mat_cr.h"
#include "../solver/nld_ms_direct.h"
#include "../solver/nld_solver.h"
#include "../solver/vector_base.h"
NETLIB_NAMESPACE_DEVICES_START()

View File

@ -14,8 +14,8 @@
#include <algorithm>
#include "nld_solver.h"
#include "nld_ms_direct.h"
#include "../solver/nld_ms_direct.h"
#include "../solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()

View File

@ -14,8 +14,8 @@
#include <algorithm>
#include "nld_solver.h"
#include "nld_ms_direct.h"
#include "../solver/nld_ms_direct.h"
#include "../solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()

View File

@ -35,7 +35,7 @@
#include "nld_ms_sor.h"
#include "nld_ms_sor_mat.h"
#include "nld_ms_gmres.h"
#include "nld_twoterm.h"
//#include "nld_twoterm.h"
#include "../nl_lists.h"
#if HAS_OPENMP
@ -428,8 +428,8 @@ matrix_solver_t * NETLIB_NAME(solver)::create_solver(int size, const int gs_thre
}
else
{
//typedef matrix_solver_SOR_t<m_N,_storage_N> solver_GS;
typedef matrix_solver_GMRES_t<m_N,_storage_N> solver_GS;
typedef matrix_solver_SOR_t<m_N,_storage_N> solver_GS;
//typedef matrix_solver_GMRES_t<m_N,_storage_N> solver_GS;
return palloc(solver_GS, &m_params, size);
}
}