Skip to content

Commit

Permalink
Minor changes to lemna.c to avoid compiler warnings, update to v1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nkehrein committed Apr 22, 2023
1 parent f656e88 commit 32bfde5
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 16 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: lemna
Title: Lemna Ecotox Effect Model
Version: 1.0.0
Version: 1.0.1
Authors@R: c(
person("Nils", "Kehrein", , "[email protected]", c("aut", "cre")),
person("SETAC Europe IG Effect Modeling", role="ccp")
Expand All @@ -18,7 +18,7 @@ License: MIT + file LICENSE
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.1.2
RoxygenNote: 7.2.3
Suggests:
knitr,
rmarkdown,
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# lemna 1.0.0
# lemna 1.0.1, 2023-04-22

* Minor change to `lemna.c` to avoid compiler warnings on CRAN

# lemna 1.0.0, 2022-05-10

* Documentation adapted to reference report version 1.1
* Added a warning message in case removed parameter `BM_threshold` is used
Expand Down
6 changes: 3 additions & 3 deletions man/effect.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/lemna.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/param_defaults.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/lemna.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void lemna_forc(void (* odeforcs)(int *, double *))
* @param T_ref ref temperature for response=1 (°C)
* @return value from the interval [0,1]
*/
double fT_loss() {
double fT_loss(void) {
return(pow(Q10, (Tmp - T_ref) / 10));
}

Expand All @@ -106,7 +106,7 @@ double fT_loss() {
* @param T_max maximum growth temperature (°C)
* @return value from the interval [0,1]
*/
double fT_photo() {
double fT_photo(void) {
double T_m = Tmp <= T_opt ? T_min : T_max;
return(pow(10, -(Tmp - T_opt)*(Tmp - T_opt) / ((T_m - T_opt)*(T_m - T_opt))));
}
Expand All @@ -117,7 +117,7 @@ double fT_photo() {
* @param beta intercept of irradiance response of photosynthesis (-)
* @return value from the interval [0,1]
*/
double fI_photo() {
double fI_photo(void) {
return(fmin(1, alpha * Irr + beta));
}

Expand All @@ -126,7 +126,7 @@ double fI_photo() {
* @param N_50 half-saturation constant of Nitrogen response (mg N L-1)
* @return value from the interval [0,1]
*/
double fN_photo() {
double fN_photo(void) {
return(Ntr / (Ntr + N_50));
}

Expand All @@ -135,7 +135,7 @@ double fN_photo() {
* @param P_50 half-saturation constant of Phosphorus response (mg P L-1)
* @return value from the interval [0,1]
*/
double fP_photo() {
double fP_photo(void) {
return(Phs / (Phs + P_50));
}

Expand Down

0 comments on commit 32bfde5

Please sign in to comment.