From 3c494f1399aa8de33ba0f9632f4f351d77025860 Mon Sep 17 00:00:00 2001
From: Craig Warren <cwarren@C17776592.local>
Date: Tue, 5 Nov 2019 14:14:57 +0000
Subject: [PATCH] Moved global autotranslate to an arg.

---
 gprMax/fields_outputs.py  | 5 +++++
 gprMax/model_build_run.py | 2 +-
 gprMax/user_inputs.py     | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gprMax/fields_outputs.py b/gprMax/fields_outputs.py
index 295aba5f..69212ed8 100644
--- a/gprMax/fields_outputs.py
+++ b/gprMax/fields_outputs.py
@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
+import logging
 from string import Template
 from pathlib import Path
 
@@ -23,6 +24,8 @@ import h5py
 
 from ._version import __version__
 
+log = logging.getLogger(__name__)
+
 
 def store_outputs(G):
     """Stores field component values for every receiver and transmission line.
@@ -109,6 +112,7 @@ def write_hdf5_main_grid_outputfile(outputfile, G):
     """
 
     write_data(outputfile, G)
+    log.info(f'Written output file: {outputfile.name}')
 
 
 def write_hdf5_sub_grid_outputfile(outputfile, G):
@@ -138,6 +142,7 @@ def write_hdf5_sub_grid_outputfile(outputfile, G):
         f.attrs['ratio'] = sg.ratio
         f.attrs['interpolation'] = sg.interpolation
 
+        log.info(f'Written output file: {fp.name}')
 
 def write_data(outputfile, G):
     """Write an output file in HDF5 format.
diff --git a/gprMax/model_build_run.py b/gprMax/model_build_run.py
index ba8b61e6..5d833d1f 100644
--- a/gprMax/model_build_run.py
+++ b/gprMax/model_build_run.py
@@ -305,7 +305,7 @@ class ModelBuildRun:
 
         # Prepare iterator
         if config.sim_config.is_messages():
-            iterator = tqdm(range(self.G.iterations), desc=f'Running model {self.G.model_num + 1}/{config.sim_config.model_end}, {config.model_configs[self.G.model_num].output_file_path_ext.name}', ncols=get_terminal_width() - 1, file=sys.stdout, disable=not config.sim_config.general['progressbars'])
+            iterator = tqdm(range(self.G.iterations), desc=f'Running model {self.G.model_num + 1}/{config.sim_config.model_end}', ncols=get_terminal_width() - 1, file=sys.stdout, disable=not config.sim_config.general['progressbars'])
         else:
             iterator = range(self.G.iterations)
 
diff --git a/gprMax/user_inputs.py b/gprMax/user_inputs.py
index 86862221..578da69c 100644
--- a/gprMax/user_inputs.py
+++ b/gprMax/user_inputs.py
@@ -46,10 +46,10 @@ def create_user_input_points(grid, user_obj):
     if isinstance(grid, SubGridBase):
         # Local object configuration trumps. User can turn of autotranslate for
         # specfic objects.
-        if not user_obj.autotranslate and config.sim_config.general['autotranslate']:
+        if not user_obj.autotranslate and config.sim_config.args.autotranslate:
             return MainGridUserInput(grid)
 
-        if config.sim_config.general['autotranslate']:
+        if config.sim_config.args.autotranslate:
             return SubgridUserInput(grid)
         else:
             return MainGridUserInput(grid)