Code

Next release#74

Code

Merged

henrus merged 39 commits intoMoDeNa-EUProject:nextReleaseMoDeNa-EUProject/MoDeNa:nextReleasefrom sigveka:nextReleaseCopy head branch name to clipboardMar 12, 2016

+3-4

Commits

Commits on Dec 9, 2015

• Adding files

  

  Sigve Karolius

  committed
  7a2c56d

  Copy full SHA for 7a2c56d

• Adding files

  

  Sigve Karolius

  committed
  2a9d34f

  Copy full SHA for 2a9d34f

• Removed dir:'Content', saved locally if this was a mistake...

  

  Sigve Karolius

  committed
  98fe4a2

  Copy full SHA for 98fe4a2

• Removed dir:'Content', saved locally if this was a mistake...

  

  Sigve Karolius

  committed
  8377459

  Copy full SHA for 8377459

Commits on Dec 10, 2015

• Starting documentation

  

  Sigve Karolius

  committed
  70575bb

  Copy full SHA for 70575bb

Commits on Dec 14, 2015

• Partial commit

  

  Sigve Karolius

  committed
  3eeba0b

  Copy full SHA for 3eeba0b

• fixing merge error

  

  Sigve Karolius

  committed
  42f61ee

  Copy full SHA for 42f61ee

• Adding file

  

  Sigve Karolius

  committed
  029f273

  Copy full SHA for 029f273

• Added some documentation, and 'import modena' to foamAgeing. No longer necessary to add PYTHONPATH to models directory

  

  Sigve Karolius

  committed
  832486f

  Copy full SHA for 832486f

Commits on Dec 15, 2015

• Documentation

  

  Sigve Karolius

  committed
  37750b3

  Copy full SHA for 37750b3

• Merge remote-tracking branch 'upstream/nextRelease' into nextRelease

  

  Sigve Karolius

  committed
  335d7d9

  Copy full SHA for 335d7d9

Commits on Dec 17, 2015

• Merge remote-tracking branch 'upstream/nextRelease' into nextRelease

  

  Sigve Karolius

  committed
  6cba987

  Copy full SHA for 6cba987

Commits on Dec 28, 2015

• Polymer density exact task modification

  

  Sigve Karolius

  committed
  8c5ee65

  Copy full SHA for 8c5ee65

• Merge error in Readme.md from examples/twoTanksFortran

  

  Sigve Karolius

  committed
  e3070fe

  Copy full SHA for e3070fe

Commits on Dec 29, 2015

• Edited function for locating 'MoDeNaModels' in 'src/python/__init__.py'

  

  Sigve Karolius

  committed
  eea190e

  Copy full SHA for eea190e

Commits on Dec 30, 2015

• Added documentation ++. Two problems: 1. Solubility 2. SurfaceTension

  

  Sigve Karolius

  committed
  395e8a4

  Copy full SHA for 395e8a4

• Merge pull request #59 from sigveka/nextRelease

  Show description for d60e1f5
  henrus

  committed
  d60e1f5

  Copy full SHA for d60e1f5

• Merge pull request #58 from japaf:recon

  Show description for f30987e
  henrus

  committed
  f30987e

  Copy full SHA for f30987e

• BUGFIX: Hardcoded paths and version

  henrus

  committed
  b537391

  Copy full SHA for b537391

• Resolve merge conflict (Model directory renamed)

  henrus

  committed
  2ad7dc9

  Copy full SHA for 2ad7dc9

Commits on Jan 6, 2016

• Fixed 'strange problem', forgot to define IndsxSet

  

  Sigve Karolius

  committed
  5ae508d

  Copy full SHA for 5ae508d

Commits on Jan 14, 2016

• restoring missing files for foam reconstruction (deleted at merging)

  

  Pavel Ferkl

  committed
  ed52c35

  Copy full SHA for ed52c35

• Merge pull request #63 from japaf/reconstruction

  Show description for 3825604
  henrus

  committed
  3825604

  Copy full SHA for 3825604

• Merge pull request #60 from sigveka/nextRelease

  Show description for b027028
  henrus

  committed
  b027028

  Copy full SHA for b027028

• Update from upstream

  

  Sigve Karolius

  committed
  782bb7c

  Copy full SHA for 782bb7c

Commits on Jan 20, 2016

• fixing merge error

  

  Sigve Karolius

  committed
  b38f57b

  Copy full SHA for b38f57b

Commits on Jan 22, 2016

• Documentation

  

  Sigve Karolius

  committed
  9bd5d2f

  Copy full SHA for 9bd5d2f

• Cleaning up before pull request

  

  Sigve Karolius

  committed
  5fbacaa

  Copy full SHA for 5fbacaa

• I added an old version of Strategy.py, fixed now

  

  Sigve Karolius

  committed
  5dcf101

  Copy full SHA for 5dcf101

• Editing Strategy.py, unfinished work was included in previous commit

  

  Sigve Karolius

  committed
  8ca71e5

  Copy full SHA for 8ca71e5

• Fixing binaries added to commits

  

  Sigve Karolius

  committed
  8619895

  Copy full SHA for 8619895

• Removing SpherePack

  

  Sigve Karolius

  committed
  ffb4bdf

  Copy full SHA for ffb4bdf

Commits on Jan 25, 2016

• Merge remote-tracking branch 'upstream/nextRelease' into nextRelease

  Show description for 09ab741
  

  Sigve Karolius

  committed
  09ab741

  Copy full SHA for 09ab741

Commits on Feb 13, 2016

• Fixed bug on autoinitialisation, removed dependency of variable name 'm' for the surrogate model definitions

  

  Sigve Karolius

  committed
  5c343c2

  Copy full SHA for 5c343c2

Commits on Feb 26, 2016

• Merge remote-tracking branch 'upstream/nextRelease' into nextRelease

  

  Sigve Karolius

  committed
  a111732

  Copy full SHA for a111732

Commits on Mar 12, 2016

• wq

  

  Sigve Karolius

  committed
  ab86baa

  Copy full SHA for ab86baa

• Loading module based on surrogate '_id'

  

  Sigve Karolius

  committed
  6c36fdf

  Copy full SHA for 6c36fdf

• Merge error fixed

  

  Sigve Karolius

  committed
  5a42de1

  Copy full SHA for 5a42de1

• Removed 'Solubility/src/Makefile' by mistake (?)

  

  Sigve Karolius

  committed
  5c076d7

  Copy full SHA for 5c076d7