Code

Develop combine#659

Code

Merged

shimwell merged 135 commits intodevelopukaea/paramak:developfrom develop_combineukaea/paramak:develop_combineCopy head branch name to clipboardJan 18, 2021

+1,942-1,033

Commits

Commits on Dec 20, 2020

• refactored tallies

  shimwell

  committed
  0f12035

• using score correcty in tallies

  shimwell

  committed
  d3f78bb

• Automated autopep8 fixes

  

  autopep8

  committed
  2f44d80

• added 3d meshes and test sp exists

  shimwell

  committed
  4aa6de7

• Merge branch 'adding_3d_mesh_tally' of github.com:ukaea/paramak into adding_3d_mesh_tally

  shimwell

  committed
  af09f7c

• Automated autopep8 fixes

  

  autopep8

  committed
  cc1b6e2

• added mesh_3d to args

  shimwell

  committed
  a72790f

• Merge branch 'adding_3d_mesh_tally' of github.com:ukaea/paramak into adding_3d_mesh_tally

  shimwell

  committed
  5dec40b

• added tests to check tally type

  shimwell

  committed
  2996952

Commits on Dec 21, 2020

• added tritium production to tests

  shimwell

  committed
  806faaf

• replaced valueerror with typeerror

  shimwell

  committed
  fb5c43e

Commits on Dec 22, 2020

• adding write vtk

  shimwell

  committed
  73ccf2c

• mkaing vtk file for 3d meshes and testing for typeerror

  shimwell

  committed
  7f9b4b4

• Automated autopep8 fixes

  

  autopep8

  committed
  0182153

• changed error type

  shimwell

  committed
  6c12e11

• Merge branch 'adding_3d_mesh_tally' of github.com:ukaea/paramak into adding_3d_mesh_tally

  shimwell

  committed
  8027bd8

Commits on Dec 23, 2020

• added vtk output for 3d mesh tallies

  shimwell

  committed
  36125ae

• improvments from code inspector

  shimwell

  committed
  820fdcb

• changed error type to TypeError

  shimwell

  committed
  5d26481

Commits on Dec 24, 2020

• Merge branch 'develop' into adding_3d_mesh_tally

  shimwell

  authored
  c201336

Commits on Dec 26, 2020

• changed method of finding TBR tally

  shimwell

  committed
  73029b0

• added TBR for each materialto tallies

  shimwell

  committed
  deb9cd3

Commits on Dec 29, 2020

• Merge branch 'adding_3d_mesh_tally' of github.com:ukaea/paramak into adding_3d_mesh_tally

  shimwell

  committed
  68fc268

• Automated autopep8 fixes

  

  autopep8

  committed
  31df8a4

• changing varible name for code inspector

  shimwell

  committed
  1a771c3

• 🐳 switched to new dependances image

  shimwell

  committed
  7d09ece

• Merge branch 'adding_3d_mesh_tally' of github.com:ukaea/paramak into adding_3d_mesh_tally

  shimwell

  committed
  d8d1cb3

• corected varible name for statepoint file

  shimwell

  committed
  955f576

Commits on Dec 30, 2020

• added type hinting to class args

  shimwell

  committed
  1664c12

• added type hinting to some function args

  shimwell

  committed
  1a38d28

• added type hint package

  shimwell

  committed
  6028cf5

• adding vtk to ignored files

  shimwell

  committed
  3331d8a

• removing types from doc string as they are in type hinting

  shimwell

  committed
  792e261

• Automated autopep8 fixes

  

  autopep8

  committed
  a707bc7

Commits on Dec 31, 2020

• moved trelis script

  shimwell

  committed
  c57fc38

• added shutil copy to create the trelis script

  shimwell

  committed
  9c0bb6d

• updated docs to remove the references to the trelis script

  shimwell

  committed
  8501c9e

• Automated autopep8 fixes

  

  autopep8

  committed
  771e24f

Commits on Jan 2, 2021

• method=None now skips geometry creation

  shimwell

  committed
  8b067fe

• Merge pull request #655 from ukaea/simulate_optionally_rebuilds_model

  Show description for 151d54e
  shimwell

  authored
  151d54e

Commits on Jan 4, 2021

• started adding type hinting

  billingsley-john

  committed
  800fac1

• Automated autopep8 fixes

  

  autopep8

  committed
  0c00666

• added missing type hint

  billingsley-john

  committed
  7df272a

• Merge branch 'update_type_hinting' of https://github.com/ukaea/paramak into update_type_hinting

  billingsley-john

  committed
  045c4e5

• fixed typo

  billingsley-john

  committed
  d53278c

• fixed typo

  billingsley-john

  committed
  e2c5ec7

• added missing import

  billingsley-john

  committed
  a02e242

• reverted to old docs for one variable until solution found

  billingsley-john

  committed
  5b36690

• added missing import

  billingsley-john

  committed
  5b351a6

• Automated autopep8 fixes

  

  autopep8

  committed
  22fa996

Commits on Jan 5, 2021

• reordered imports for best practice

  Show description for ba7d5c6
  

  billingsley-john

  and

  shimwell

  authored
  ba7d5c6

• sorted imports

  billingsley-john

  committed
  fd32abf

• Merge pull request #656 from ukaea/update_type_hinting

  Show description for 65a0a2c
  billingsley-john

  authored
  65a0a2c

• changed pypi basge

  shimwell

  committed
  168f102

• corrected file path checking

  shimwell

  committed
  287b345

Commits on Jan 6, 2021

• 🐳 corrected dockerfile name

  shimwell

  committed
  b1577ac

• Merge branch 'develop_combine' into adding_3d_mesh_tally

  shimwell

  authored
  b11c6f8

• Merge pull request #645 from ukaea/adding_3d_mesh_tally

  Show description for ffbadc4
  shimwell

  authored
  ffbadc4

• Merge pull request #658 from ukaea/docker_build_fix

  Show description for 86db75d
  shimwell

  authored
  86db75d

• Merge pull request #649 from ukaea/move_trelis_script_automatically

  Show description for 472b31a
  shimwell

  authored
  472b31a

• Merge pull request #648 from ukaea/adding_type_hinting

  Show description for 8990ed5
  shimwell

  authored
  8990ed5

• removed second pymoab install

  shimwell

  committed
  1f213eb

• Merge pull request #661 from ukaea/improved_dockerfile

  Show description for 8bb9b4e
  shimwell

  authored
  8bb9b4e

Commits on Jan 7, 2021

• added missing ;

  shimwell

  committed
  093c0ef

• moved cuttering shape to midpoint

  shimwell

  committed
  40d2f6c

• putting cutting intercept back to 50

  shimwell

  committed
  44dd13a

Commits on Jan 8, 2021

• 🐳 made more similar to openmc dockerfile

  shimwell

  committed
  1d18a35

• updated indentation and pymoab install

  shimwell

  committed
  7c4ec7b

Commits on Jan 9, 2021

• adds the option for surface_reflectivity

  shimwell

  committed
  31d6a5a

• added surface_reflectivity test

  shimwell

  committed
  ed28bf8

Commits on Jan 10, 2021

• accepts imported stp files as shapes

  shimwell

  committed
  a90ff7b

• Automated autopep8 fixes

  

  autopep8

  committed
  3e69d03

• added docstrings and types to new function

  shimwell

  committed
  69a6e3f

Commits on Jan 11, 2021

• added tests for neutron photon spectra

  shimwell

  committed
  e8094db

• Automated autopep8 fixes

  

  autopep8

  committed
  824b8ff

• added example for particle spectra plots

  shimwell

  committed
  0132613

• Merge branch 'spectra_tally' of github.com:ukaea/paramak into spectra_tally

  shimwell

  committed
  984346b

• Automated autopep8 fixes

  

  autopep8

  committed
  ff3c6cd

• suggestiosn from code inspector

  shimwell

  committed
  b621522

• Merge pull request #673 from ukaea/spectra_tally

  Show description for 2cfd300
  shimwell

  authored
  2cfd300

• Merge pull request #670 from ukaea/adding_reflectivity_option

  Show description for 8d191b4
  shimwell

  authored
  8d191b4

• suggestions form code inspector

  shimwell

  committed
  4eeca1f

• Merge pull request #674 from ukaea/adding_reflectivity_option

  Show description for e033c61
  shimwell

  authored
  e033c61

• Automated autopep8 fixes

  

  autopep8

  committed
  b8f7c3d

• fixed typo missing :

  shimwell

  authored
  57062f4

• fixed tpyo errors missing arg

  shimwell

  committed
  22d2eb9

• fixed html links

  shimwell

  committed
  18204e5

Commits on Jan 12, 2021

• added ability to process output file without simulating

  shimwell

  committed
  a740943

• obtaining mesh shape from meshfilter

  shimwell

  committed
  1ba19b2

• reduce duplicate code using 2d mesh png writting function

  shimwell

  committed
  63db479

• reduce duplicate code using 2d mesh png writting function

  shimwell

  committed
  0c3cb84

• moved get neutronics results to utils

  shimwell

  committed
  381629e

• added tests for custom output filename

  shimwell

  committed
  c4d44a9

• added tests for custom output filename and fixed tests

  shimwell

  committed
  97aa89b

• Automated autopep8 fixes

  

  autopep8

  committed
  040adb4

• added more type hinting

  shimwell

  committed
  90832e1

Commits on Jan 13, 2021

• added more type hints

  shimwell

  committed
  d1aca77

• fixed merge conflict

  shimwell

  committed
  3bed34f

• Automated autopep8 fixes

  

  autopep8

  committed
  23b9255

• code inspector suggestions

  shimwell

  committed
  834ea04

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

  shimwell

  committed
  37435e5

• changed moveTo() to center()

  billingsley-john

  committed
  5532a63

• updated layout

  billingsley-john

  committed
  6ebe26b

• updated to use center() instead of moveTo()

  billingsley-john

  committed
  4398e15

• fixed arc construction

  billingsley-john

  committed
  5a3b636

• Merge pull request #675 from ukaea/fix_sweep

  Show description for 33e0568
  billingsley-john

  authored
  33e0568

• Merge branch 'develop' into develop_combine

  shimwell

  authored
  8ab8bd6

• using pymoab setup.py

  shimwell

  committed
  042a792

• code inspector suggestions

  shimwell

  committed
  4cc6d16

Commits on Jan 14, 2021

• Merge branch 'develop' into develop_combine

  shimwell

  authored
  cbf54fe

• Code review suggestions from Remi

  Show description for 6af2c60
  

  shimwell

  and

  RemDelaporteMathurin

  authored
  6af2c60

• add openmc as optional import

  shimwell

  committed
  9fc225b

• added tests for export stp in cm

  shimwell

  committed
  451c870

• testing the name of the gyard

  shimwell

  committed
  8ec0fcf

• Automated autopep8 fixes

  

  autopep8

  committed
  c72a951

• moved openmc import to functions

  shimwell

  committed
  3db8f1e

• moved ppp route to NotImplementedError

  shimwell

  committed
  fcff298

• added extra type tests

  shimwell

  committed
  d592315

• Automated autopep8 fixes

  

  autopep8

  committed
  d27d9b2

• added more type tests

  shimwell

  committed
  830c5c3

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

  shimwell

  committed
  81dac9e

• added test to check method = None works

  shimwell

  committed
  8d5d493

Commits on Jan 15, 2021

• added new test

  billingsley-john

  committed
  e9bfdee

• converted nested tests into single unit tests

  shimwell

  committed
  73c646d

• updated tests to ensure assertions are tested correctly

  billingsley-john

  committed
  c45ce20

• Automated autopep8 fixes

  

  autopep8

  committed
  9299e01

• Merge pull request #681 from ukaea/fix_assertRaises_tests

  Show description for c4d7037
  billingsley-john

  authored
  c4d7037

• pullrequest.com suggestions

  shimwell

  committed
  67d93de

• pullrequest.com suggestions

  shimwell

  committed
  7e3b0af

• Automated autopep8 fixes

  

  autopep8

  committed
  1cfab27

Commits on Jan 16, 2021

• corrected arg name tolerance not tol

  shimwell

  committed
  dfb7b9e

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

  shimwell

  committed
  7b32d40

• corrected arg name tolerance not tol

  shimwell

  committed
  a9208fe

• changed error types

  shimwell

  committed
  485018a

• corrected error type

  shimwell

  committed
  e975e64