fixing merge conflicts

fawda123 · Mar 22, 2022 · 24b0c43 · 24b0c43
2 parents 9d44644 + e8c6ec2
commit 24b0c43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/R/ecometab.R b/R/ecometab.R
@@ -232,6 +232,7 @@ ecometab.default <- function(dat_in, tz, DO_var = 'DO_mgl', depth_val = 'Tide',
 
   #get exchange at air water interface
   # DO/DOsat - DO reduces to Cs - C in mmol/m3 (DOsat is actually a ratio between DO and DO at saturation
+  # D in units of mmol/m3/hr
   D=Ka*(DO/DOsat-DO)
 
   #combine all data for processing

diff --git a/man/ecometab.Rd b/man/ecometab.Rd