Skip to content

Dev#3

Merged
hsonne merged 64 commits intomainfrom
dev
Nov 7, 2023
Merged

Dev#3
hsonne merged 64 commits intomainfrom
dev

Conversation

@hsonne
Copy link
Copy Markdown
Member

@hsonne hsonne commented Oct 27, 2023

No description provided.

hsonne and others added 30 commits October 27, 2023 03:32
Let the function decide whether to call FUN
for each row in data or only for the unique
value combinations of the relevant columns.

Add utility functions:
- expand_to_vector()
- n_dims()
- rbind_first_rows()
- seq_along_rows()
- split_into_identical_rows()
if x is out of the range. Otherwise NA was
returned which caused errors later on.
and correct the stop expression: not the
value to be looked up in the vector needs to
be in a certain range but the index.
-> avoid repetition of "result"
and acess input columns safely using helper
functions
as it is done in the C++ code!
Handle waterbody: return potential evaporation
and not the whole configuration list.
Do not create element "potentialEvaporation"
in getDefaultConfiguration() any more. Instead,
use what abimo_config_to_config() returns.
It is not needed any more
Improve interface to call_with_data()
define lookup tables globally:
  LOOKUP_G001
  SUMMER_CURRECTION_MATRIX
  -> matrix instead of data frame

rename
  getEffectivityParameter() to
  determineBagrovParameter()

rename
  effectivity/efficiency to
  bagrovParameter
# Conflicts:
#	R/realEvapoTranspiration.R
#	man/realEvapoTranspiration.Rd
and all of its subfunctions
hsonne and others added 29 commits November 1, 2023 15:28
I was using the code from the clean-bagrov
branch of https://github.com/KWB-R/abimo
calculate days of growth out of the function
interpolate_cpp() is the more or less direct
translation from C++ code to R.

interpolate() is the vectorised R version
(hopefully returning the same)
@hsonne hsonne merged commit c8d2374 into main Nov 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant