From 4e5b2e09f9ed17201a0e162fa89da468edb9e457 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Thu, 24 Feb 2022 17:19:33 +0000 Subject: [PATCH] Added tranmission line warning for OpenCL. --- gprMax/cmds_multiuse.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gprMax/cmds_multiuse.py b/gprMax/cmds_multiuse.py index b9dfa026..0a45dfe0 100644 --- a/gprMax/cmds_multiuse.py +++ b/gprMax/cmds_multiuse.py @@ -653,10 +653,11 @@ class TransmissionLine(UserObjectMulti): self.__dorotate(grid) # Warn about using a transmission line on GPU - if config.sim_config.general['cuda']: + if (config.sim_config.general['solver'] == 'cuda' or + config.sim_config.general['solver'] == 'opencl'): logger.exception(self.params_str() + ' cannot currently be used ' + - 'with GPU solving. Consider using a ' + - '#voltage_source instead.') + 'with the CUDA or OpenCL-based solver. Consider ' + + 'using a #voltage_source instead.') raise ValueError # Check polarity & position parameters @@ -822,7 +823,11 @@ class Rx(UserObjectMulti): else: outputs.sort() # Get allowable outputs - allowableoutputs = RxUser.allowableoutputs_gpu if config.sim_config.general['cuda'] else RxUser.allowableoutputs + if (config.sim_config.general['solver'] =='cuda' or + config.sim_config.general['solver'] =='opencl'): + allowableoutputs = RxUser.allowableoutputs_dev + else: + allowableoutputs = RxUser.allowableoutputs # Check and add field output names for field in outputs: if field in allowableoutputs: