Merge pull request #655 from ukaea/simulate_optionally_rebuilds_model

Simulate optionally rebuilds model

.github/workflows/dockerhub-publish-dependencies.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           dockerfile: DockerfileDependances
           push: true
-          tags: ukaea/paramak:latest
+          tags: ukaea/paramak:dependances
           build-args: |
             cq_version=master
             compile_cores=2

paramak/parametric_neutronics/neutronics_model.py

@@ -297,17 +297,19 @@ def create_neutronics_geometry(self, method=None):
 
         Arguments:
             method: (str): The method to use when making the imprinted and
-                merged geometry. Options are "ppp", "trelis", "pymoab".
-                Defaults to None.
+                merged geometry. Options are "ppp", "trelis", "pymoab" and
+                None.  Defaults to None.
         """
 
-        os.system('rm dagmc_not_watertight.h5m')
-        os.system('rm dagmc.h5m')
-
-        if method not in ['ppp', 'trelis', 'pymoab']:
+        if method in ['ppp', 'trelis', 'pymoab']:
+            os.system('rm dagmc_not_watertight.h5m')
+            os.system('rm dagmc.h5m')
+        elif method is None and Path.is_file('dagmc.h5m'):
+            print('Using previously made dagmc.h5m file')
+        else:
             raise ValueError(
                 "the method using in create_neutronics_geometry \
-                should be either ppp or trelis not", method)
+                should be either ppp, trelis, pymoab or None.", method)
 
         if method == 'ppp':
 
@@ -350,8 +352,7 @@ def create_neutronics_geometry(self, method=None):
                 filename='dagmc.h5m',
                 tolerance=self.faceting_tolerance
             )
-
-        print('neutronics model saved as dagmc.h5m')
+        return 'dagmc.h5m'
 
     def _make_watertight(self):
         """Runs the DAGMC make_watertight script thatt seals the facetets of