Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Model B and fix non monthly timestep flow calculation #28

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ab6a0dd
adding Centrifuges Configs
bam241 Apr 24, 2018
ea7fd38
add some comment, fix some default values to P1-type centrifuges
bam241 Apr 24, 2018
6924c61
getting the correct includes
bam241 Apr 24, 2018
434b0c2
removing methods reimplemented in CentrifugeConfig
bam241 May 17, 2018
3c4174e
cleaning enrich_functions_tests
bam241 May 17, 2018
ab6e26f
first add of stageconfig
bam241 Apr 24, 2018
c187d70
add StageConfig to CmakeFile
bam241 Apr 24, 2018
64e8fa5
some improvement
bam241 Apr 24, 2018
41c0c8c
some improvement in StageConfig, with a constructor without centrifug…
bam241 Apr 24, 2018
edf01d8
autoformat
bam241 Apr 24, 2018
9c48138
removing methods reimplemented in StageConfig
bam241 May 17, 2018
e10708f
cleaning enrich_functions_tests
bam241 May 17, 2018
67ddee9
initial import
bam241 May 10, 2018
8ee82fe
some reshape on the cascade config
bam241 May 10, 2018
98e58e1
Removing some file not suppose to be there yet
bam241 May 11, 2018
3a88d06
removing methods reimplemented in CascadeConfig
bam241 May 17, 2018
c6dd278
removing methods reimplemented in CascadeConfig
bam241 May 17, 2018
621c1bc
readd missing file
bam241 May 17, 2018
44870b0
initial addition
bam241 May 11, 2018
c32ac30
working version
bam241 May 11, 2018
5755cc9
readd missing file
bam241 May 17, 2018
682af6b
fix test header
bam241 May 17, 2018
9bede5c
fix unit_test
bam241 May 17, 2018
a452b24
initial import
bam241 May 10, 2018
cda454e
compiling
bam241 May 14, 2018
52194d9
adding unit test for stage method, fixing Product by Gamma calculation
bam241 May 16, 2018
cc501b6
initial import
bam241 May 10, 2018
d9c5a37
compiling
bam241 May 14, 2018
00384dc
adding unit test for stage method, fixing Product by Gamma calculation
bam241 May 16, 2018
dde2f7b
removing secondpermonth mention in centrifugeconfig (not used)
bam241 May 16, 2018
48bbef9
allow to have differnet timestep size
bam241 May 16, 2018
3194c99
Merge branch 'case_2' into case_2_time
bam241 May 17, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
USE_CYCLUS("mbmore" "mytest")
USE_CYCLUS("mbmore" "behavior_functions")
USE_CYCLUS("mbmore" "RandomEnrich")

USE_CYCLUS("mbmore" "CentrifugeConfig")
USE_CYCLUS("mbmore" "StageConfig")
USE_CYCLUS("mbmore" "CascadeConfig")
USE_CYCLUS("mbmore" "CascadeEnrich")

USE_CYCLUS("mbmore" "RandomSink")
USE_CYCLUS("mbmore" "StateInst")
USE_CYCLUS("mbmore" "InteractRegion")
Expand Down
Loading