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.

Sign up for GitHub

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

Jump to bottom

Feature/small hackathon #81

Merged
merged 82 commits into from
Apr 13, 2022
Merged

Feature/small hackathon #81

merged 82 commits into from
Apr 13, 2022

Conversation

Carsopre
Copy link
Collaborator

No description provided.

DzimbaS and others added 30 commits March 16, 2022 09:31
@DzimbaS
new constants class
1d216af
@DzimbaS
new class colonization start
ef033b1
@DzimbaS
new class vegetation
93d37df
@DzimbaS
changes to veg_model
46039f5
@deboradta
created get_hydromorphodynamics and import vegetation model
99777ae
@deboradta
base_simulation.py - created initiate_hydromorphodynamics
3bd62d6 
delft3d.py - created update_hydromorphodynamics
@DzimbaS
Addition of vegetation characteristics method, growth and mortality c…
36f84b5 
…lasses. New veg_base_simulation.
@DzimbaS
Merge branch 'saltmarsh_debora' into SaltMarsh_Sarah
4238dd9 
# Conflicts:
#	src/core/bio_process/colonisation.py
@DzimbaS
Addition of vegetation characteristics method, growth and mortality c…
69e8e77 
…lasses. New veg_base_simulation.
@DzimbaS
add class Hydro_Morphodynamics, process in veg_base_simulation.py
fac4a49
@DzimbaS
changes to Hydro_Morphodynamics, process in veg_base_simulation.py
7a49900
@DzimbaS
changes to Hydro_Morphodynamics, process in veg_base_simulation.py, p…
df2a4d7 
…rogress in the veg bio-processes
@DzimbaS
changes to Hydro_Morphodynamics, process in veg_base_simulation.py, p…
d0ab434 
…rogress in the veg bio-processes
@DzimbaS
progress in mortality
5bbb8b4
@deboradta
output
66f7f72
@deboradta
updates to output
428c137
@DzimbaS
progress in mortality
fcbcfb9
@deboradta
Merge branch 'SaltMarsh_Sarah' into saltmarsh_debora
6aa5d37
@DzimbaS
Merge branch 'saltmarsh_debora' into SaltMarsh_Sarah
95d1c0f
@DzimbaS
account for maxAge vegetation in veg_growth
62727fa
@deboradta
Merge branch 'SaltMarsh_Sarah' into saltmarsh_debora
11b4004
@DzimbaS
account for maxAge vegetation in veg_growth
d5d4fc8
@deboradta
Merge branch 'SaltMarsh_Sarah' into saltmarsh_debora
a119170
@deboradta
updates to output
2d85f97
@DzimbaS
changes after debugging
c4e1589
@DzimbaS
simtest
eadb6ec
@DzimbaS
veg_delft3D_simulation file
861e7b8
@DzimbaS
changes to veg_model
967bd69
@deboradta
updates veg_model
15e4cd9
@DzimbaS
json file for constants and changes to constants class
5f67647
DzimbaS and others added 23 commits April 8, 2022 12:02
@DzimbaS
debugging and file to read output
21d4c98
@DzimbaS
debugging and output
6d1579f
@DzimbaS
debugging and output
c7d824f
@DzimbaS
debugging and additions for Salicornia
2416842
@deboradta
updates veg_mortality.py
306e463
@DzimbaS
changes in mortality
3cbb510
@DzimbaS
changes in update lifestages
5376074
@DzimbaS
changes in output
4184bc5
@Carsopre
ci(pyproject.toml): Corrected tool typo
484c1fc
@deboradta
Merge pull request #77 from DzimbaS/SaltMarsh_Sarah
53e1ce3 
Salt marsh sarah
@Carsopre
Merge branch 'feature/small-hackathon' of https://github.com/Deltares…
f36209f 
…/NBSDynamics into feature/small-hackathon
@DzimbaS
added test case
ac43ce1
@Carsopre
Merge branch 'feature/small-hackathon' of https://github.com/Deltares…
cfe83b3 
…/NBSDynamics into feature/small-hackathon
@Carsopre
test(test/test_data/): Added missing data
d462ae7
@DzimbaS
test_acceptance.py
9f145d6
@DzimbaS
delete sim_test
8860a20
@Carsopre
test(test/test_acceptance.py): Fixed test
6c085ce
@Carsopre
test(test/test_acceptance.py): Modified test to run on any machine
448c0d6
@Carsopre
test(transect_case): Fixed missing test data for the transect case ou…
aa1b174 
…tput
@Carsopre
autoformat: isort & black
9dab0a1
@deboradta
Documentation
fb73acf
@deboradta
Merge remote-tracking branch 'origin/feature/small-hackathon' into fe…
401fdf5 
…ature/small-hackathon
@deboradta
autoformat: isort & black
e294cc3
@Carsopre Carsopre marked this pull request as ready for review April 12, 2022 14:37
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 106 Code Smells

27.2% 27.2% Coverage
8.1% 8.1% Duplication

@Carsopre Carsopre merged commit 228ad15 into master Apr 13, 2022
@Carsopre Carsopre deleted the feature/small-hackathon branch April 13, 2022 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deboradta deboradta deboradta approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Carsopre @deboradta @DzimbaS