aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-12-22Merge branch 'master' of ssh://jrwb.de/pfmJohannes Ranke17-26/+12
2016-12-22Fix reading in times from .out filesJohannes Ranke3-8/+28
The code from the previous commit was broken. Also, the time zone for the times that are read is now wet to 'UTC', in order to avoid setting different time zones due to daylight savings, which introduces artificial one-hour offsets on changeover days.
2016-12-14Changelog update and roxygen runJohannes Ranke18-27/+19
2016-12-14Set time correctly for 00:00 hours in .out fileJohannes Ranke1-5/+10
For ConLiqWatLayCur_xxxxx entries which are output at 00:00 (midnight), no time is listed in the .out file for this time. This commit introduces a workaround, setting the time to 00:00 when there is no time information.
2016-12-12Fix reading .out for acronyms containing numbersJohannes Ranke5-5/+17
2016-10-13Add drat target, remove unmaintained usage hintsJohannes Ranke1-10/+3
2016-09-27Reorganise repository using standard package layoutJohannes Ranke121-29/+10927
2016-09-27Make the chents package optionalJohannes Ranke3-8/+7
2016-09-23Keep the graph for the markdown fileJohannes Ranke2-1/+0
The markdown file is not self-contained as the html file...
2016-09-23Slightly update the READMEJohannes Ranke6-29/+175503
2016-07-30Update static documentationJohannes Ranke17-41/+55
2016-07-30Add 'methods' to dependeciesJohannes Ranke1-1/+2
2016-07-30Fix the TOXSWA reading testJohannes Ranke2-8/+13
Since a recent commit we are reading the concentrations at the end of each hour, so the test needed to be updated accordingly
2016-07-30Import 'is' from methodsJohannes Ranke2-0/+2
2016-07-30Read cwas from .out files with metabolitesJohannes Ranke2-7/+29
TOXSWA 4 stores the detailed output for SWASH runs with metabolites in its .out files. With this commit it is possible to read in .out files from such runs with metabolites. Default is to read in the concentrations for the parent, a newly gained "substance" argument makes it possible to specify the metabolite for which the data should be read.
2016-07-15Fix calculation of t_firstjanJohannes Ranke2-2/+8
There is an inconsistency in (some?) output files, so the first datetime needs to be fixed before reading it into a data frame
2016-06-08Clean up remainders of NL drift calculation functionJohannes Ranke2-38/+0
2016-06-08Merge branch 'master' of https://github.com/jranke/pfmJohannes Ranke0-0/+0
2016-06-08Use the concentration at the end of the hourJohannes Ranke3-6/+10
This is also what TOXSWA presents in the summary files
2016-06-08Use the concentration at the end of the hourJohannes Ranke2-4/+8
This is also what TOXSWA presents in the summary files
2016-03-10Merge the NL drift calculations based on percentages into PEC_sw_driftJohannes Ranke5-54/+56
2016-03-10Add NL specific drift calculationsJohannes Ranke2-2/+51
2016-03-02Fix the name of the Chateadun scenarioJohannes Ranke2-2/+2
2016-02-04Test reading .out files and close connectionsJohannes Ranke5-5/+27
2016-02-04Improve reading spead for new TOXSWA formatJohannes Ranke7-16/+28
2016-02-04Read cwa data from TOXSWA 4.4.2 .out filesJohannes Ranke2-40/+93
2015-12-27Fix rounding of endpoint retrieval functionsJohannes Ranke3-3/+7
2015-12-27Another useless variant to avoid warnings in staticdoc plotsJohannes Ranke1-0/+2
2015-12-22EFSA 2015 tier 1 PEC soil, clean up, add static docsJohannes Ranke75-175780/+11589
2015-12-18Documentation fixes, chents is currently a hard dependencyJohannes Ranke9-26/+66
2015-10-15Add endpoint and GUS functions, roxygenizeJohannes Ranke27-41/+455
2015-10-01Add some soil data for FOCUS groundwater scenariosJohannes Ranke6-1/+84
2015-09-11Added PEC soil for products as defined in chents v0.1-2Johannes Ranke8-94/+43
2015-09-10Add PEC soil for product with serveral aisJohannes Ranke2-271/+6
2015-08-26Merge branch 'master' into pfm_chentJohannes Ranke5-3/+184
Conflicts: pkg/DESCRIPTION
2015-08-22Updates of DESCRIPTION and NAMESPACEJohannes Ranke2-2/+1
2015-08-22Add README.html for cgit on jrwb.deJohannes Ranke3-1/+183
2015-08-22Small documentation updatesJohannes Ranke8-15/+15
2015-08-21Merge branch 'master' into pfm_chentJohannes Ranke25-40/+90
2015-08-21Adapt the description to R CMD check requirementsJohannes Ranke1-3/+3
2015-08-21Updates to pass checks and testsJohannes Ranke9-14/+56
2015-07-02Changes to pass R CMD check --as-cran, roxygen runJohannes Ranke18-27/+35
2015-06-18Merge branch 'master' into pfm_chentJohannes Ranke28-6/+850
Conflicts: pkg/DESCRIPTION pkg/NAMESPACE
2015-06-12Add sediment PEC calculations using the percentage methodJohannes Ranke5-1/+103
2015-06-12Make UK drainage with non-SFO soil degradation workJohannes Ranke1-6/+8
2015-06-11Now we pass R CMD checkJohannes Ranke4-15/+36
2015-06-11Add UK tier 1 drainage PEC calculationsJohannes Ranke6-0/+186
2015-06-11Now there is enough content to warrant 0.2-xJohannes Ranke1-1/+1
2015-06-11Add facilities to calculate decline curvesJohannes Ranke8-1/+208
2015-06-11Generate README.md with current pfm versionJohannes Ranke1-1/+2

Contact - Imprint