Merge branch 'develop_combine' of github.com:ukaea/paramak into devel…

…op_combine
ukaea · Jan 14, 2021 · 81dac9e · 81dac9e
2 parents 830c5c3 + d27d9b2
commit 81dac9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/paramak/parametric_neutronics/neutronics_model.py b/paramak/parametric_neutronics/neutronics_model.py
@@ -324,10 +324,9 @@ def create_neutronics_geometry(self, method: str = None):
                 "PPP + OCC Faceter / Gmesh option is under development and not \
                 ready to be implemented. Further details on the repositories \
                 https://github.com/makeclean/occ_faceter/ \
-                https://github.com/ukaea/parallel-preprocessor "
-            )
+                https://github.com/ukaea/parallel-preprocessor ")
 
-            #TODO when the development is ready to test
+            # TODO when the development is ready to test
             # self.geometry.export_stp()
             # self.geometry.export_neutronics_description()
             # # as the installer connects to the system python not the conda

diff --git a/tests/test_parametric_neutronics/test_NeutronicModel.py b/tests/test_parametric_neutronics/test_NeutronicModel.py
@@ -39,7 +39,7 @@ def test_merge_tolerance_setting_and_getting(self):
 
         assert my_model.merge_tolerance == 1e-4
 
-        my_model.merge_tolerance=1e-6
+        my_model.merge_tolerance = 1e-6
         assert my_model.merge_tolerance == 1e-6
 
     def test_neutronics_component_simulation_with_openmc_mat(self):
@@ -295,7 +295,7 @@ def incorrect_materials_type():
             test_model = paramak.NeutronicsModel(
                 geometry=self.my_shape,
                 source=self.source,
-                materials={'center_column_shield_mat':23},
+                materials={'center_column_shield_mat': 23},
             )
 
             test_model.create_materials()