ompthreads value now read from model_config rather than hostinfo

这个提交包含在:
Craig Warren
2021-03-09 10:01:08 +00:00
父节点 0055d1d72f
当前提交 9efedc3f44
共有 2 个文件被更改,包括 6 次插入6 次删除

查看文件

@@ -311,7 +311,7 @@ class PML:
pmlmodule = 'gprMax.cython.pml_updates_electric_' + self.G.pmlformulation pmlmodule = 'gprMax.cython.pml_updates_electric_' + self.G.pmlformulation
func = getattr(import_module(pmlmodule), 'order' + str(len(self.CFS)) + '_' + self.direction) func = getattr(import_module(pmlmodule), 'order' + str(len(self.CFS)) + '_' + self.direction)
func(self.xs, self.xf, self.ys, self.yf, self.zs, self.zf, func(self.xs, self.xf, self.ys, self.yf, self.zs, self.zf,
config.sim_config.hostinfo['ompthreads'], self.G.updatecoeffsE, self.G.ID, config.get_model_config().ompthreads, self.G.updatecoeffsE, self.G.ID,
self.G.Ex, self.G.Ey, self.G.Ez, self.G.Hx, self.G.Hy, self.G.Hz, self.G.Ex, self.G.Ey, self.G.Ez, self.G.Hx, self.G.Hy, self.G.Hz,
self.EPhi1, self.EPhi2, self.ERA, self.ERB, self.ERE, self.ERF, self.d) self.EPhi1, self.EPhi2, self.ERA, self.ERB, self.ERE, self.ERF, self.d)
@@ -321,7 +321,7 @@ class PML:
pmlmodule = 'gprMax.cython.pml_updates_magnetic_' + self.G.pmlformulation pmlmodule = 'gprMax.cython.pml_updates_magnetic_' + self.G.pmlformulation
func = getattr(import_module(pmlmodule), 'order' + str(len(self.CFS)) + '_' + self.direction) func = getattr(import_module(pmlmodule), 'order' + str(len(self.CFS)) + '_' + self.direction)
func(self.xs, self.xf, self.ys, self.yf, self.zs, self.zf, func(self.xs, self.xf, self.ys, self.yf, self.zs, self.zf,
config.sim_config.hostinfo['ompthreads'], self.G.updatecoeffsH, self.G.ID, config.get_model_config().ompthreads, self.G.updatecoeffsH, self.G.ID,
self.G.Ex, self.G.Ey, self.G.Ez, self.G.Hx, self.G.Hy, self.G.Hz, self.G.Ex, self.G.Ey, self.G.Ez, self.G.Hx, self.G.Hy, self.G.Hz,
self.HPhi1, self.HPhi2, self.HRA, self.HRB, self.HRE, self.HRF, self.d) self.HPhi1, self.HPhi2, self.HRA, self.HRB, self.HRE, self.HRF, self.d)

查看文件

@@ -68,7 +68,7 @@ class CPUUpdates:
update_magnetic_cpu(self.grid.nx, update_magnetic_cpu(self.grid.nx,
self.grid.ny, self.grid.ny,
self.grid.nz, self.grid.nz,
config.sim_config.hostinfo['ompthreads'], config.get_model_config().ompthreads,
self.grid.updatecoeffsH, self.grid.updatecoeffsH,
self.grid.ID, self.grid.ID,
self.grid.Ex, self.grid.Ex,
@@ -101,7 +101,7 @@ class CPUUpdates:
update_electric_cpu(self.grid.nx, update_electric_cpu(self.grid.nx,
self.grid.ny, self.grid.ny,
self.grid.nz, self.grid.nz,
config.sim_config.hostinfo['ompthreads'], config.get_model_config().ompthreads,
self.grid.updatecoeffsE, self.grid.updatecoeffsE,
self.grid.ID, self.grid.ID,
self.grid.Ex, self.grid.Ex,
@@ -117,7 +117,7 @@ class CPUUpdates:
self.dispersive_update_a(self.grid.nx, self.dispersive_update_a(self.grid.nx,
self.grid.ny, self.grid.ny,
self.grid.nz, self.grid.nz,
config.sim_config.hostinfo['ompthreads'], config.get_model_config().ompthreads,
config.get_model_config().materials['maxpoles'], config.get_model_config().materials['maxpoles'],
self.grid.updatecoeffsE, self.grid.updatecoeffsE,
self.grid.updatecoeffsdispersive, self.grid.updatecoeffsdispersive,
@@ -162,7 +162,7 @@ class CPUUpdates:
self.dispersive_update_b(self.grid.nx, self.dispersive_update_b(self.grid.nx,
self.grid.ny, self.grid.ny,
self.grid.nz, self.grid.nz,
config.sim_config.hostinfo['ompthreads'], config.get_model_config().ompthreads,
config.get_model_config().materials['maxpoles'], config.get_model_config().materials['maxpoles'],
self.grid.updatecoeffsdispersive, self.grid.updatecoeffsdispersive,
self.grid.ID, self.grid.ID,