Skip to content

Commit

Permalink
Full rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
RLumSK committed Nov 8, 2021
1 parent a54d7e9 commit a0825ba
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}
],
"notes": "The initial development was financed through the project 'Modelling quartz luminescence signal dynamics relevant for dating and dosimetry' (DFG SCHM 305114-1)",
"version": "0.2.9.9000-4",
"version": "0.2.9",
"upload_type": "software",
"keywords": ["Luminescence dating", "Modelling", "Energy-band diagrams", "Quartz models"],
"publication_date": "2021-11-08",
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: RLumModel
Type: Package
Title: Solving Ordinary Differential Equations to Understand Luminescence
Version: 0.2.9.9000-4
Version: 0.2.9
Date: 2021-11-08
Author: Johannes Friedrich [aut, trl, cre] (<https://orcid.org/0000-0002-0805-9547>),
Sebastian Kreutzer [aut, ths] (<https://orcid.org/0000-0002-0734-2199>),
Expand Down
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@

# NEWS for the R Package RLumModel

## Changes in version 0.2.9.9000-4 (2021-11-08)
## Changes in version 0.2.9 (November 08, 2021)

- Export internal function `.set_pars()`

------------------------------------------------------------------------

## Changes in version 0.2.8 (April 08, 2021)

- This version requires R \> 3.6.0
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"Name","Title","Description","Version","m.Date","m.Time","Author","Citation"
".set_pars","Set parameters for Different Quartz Luminescence Models","This function provides all necessary model parameters to the calculation of the ODEs.","0.1.3
",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany),<br />","Friedrich, J., 2021. .set_pars(): Set parameters for Different Quartz Luminescence Models. Function version 0.1.3. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany),<br />","Friedrich, J., 2021. .set_pars(): Set parameters for Different Quartz Luminescence Models. Function version 0.1.3. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel
"
"ExampleData.ModelOutput","Example data (TL curve) simulated with parameter set from Pagonis 2007","Example data (TL curve) simulated with parameter set from Pagonis 2007","0.1.1
",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany)<br />",NA
"model_LuminescenceSignals","Model Luminescence Signals","This function models luminescence signals for quartz based on published physical models. It is possible to simulate TL, (CW-) OSL, RF measurements in a arbitrary sequence. This sequence is definded as a list of certain abrivations. Furthermore it is possible to load a sequence direct from the Riso Sequence Editor. The output is an RLum.Analysis object and so the plots are done by the plot_RLum.Analysis function. If a SAR sequence is simulated the plot output can be disabled and SAR analyse functions can be used.","0.1.5
",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany),<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)<br />","Friedrich, J., Kreutzer, S., 2021. model_LuminescenceSignals(): Model Luminescence Signals. Function version 0.1.5. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany),<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)<br />","Friedrich, J., Kreutzer, S., 2021. model_LuminescenceSignals(): Model Luminescence Signals. Function version 0.1.5. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel
"
"read_SEQ2R","Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence","A SEQ-file created by the Risoe Sequence Editor can be imported to simulate the sequence written in the sequence editor.","0.1.0
",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany),<br />","Friedrich, J., 2021. read_SEQ2R(): Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence. Function version 0.1.0. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
",NA,NA,"Johannes Friedrich, University of Bayreuth (Germany),<br />","Friedrich, J., 2021. read_SEQ2R(): Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence. Function version 0.1.0. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel
"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<p class='character'><h2 align="center">Major functions in the R package 'Luminescence'</h2>
<h4 align="center"> [version: 0.2.9.9000-4 ]</h4>
<h4 align="center"> [version: 0.2.9 ]</h4>
<style type="text/css">
<!--

Expand Down Expand Up @@ -71,7 +71,7 @@ <h4 align="center"> [version: 0.2.9.9000-4 ]</h4>
</td>
<td class=cellinside>Johannes Friedrich, University of Bayreuth (Germany),<br />
</td>
<td class=cellinside>Friedrich, J., 2021. .set_pars(): Set parameters for Different Quartz Luminescence Models. Function version 0.1.3. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
<td class=cellinside>Friedrich, J., 2021. .set_pars(): Set parameters for Different Quartz Luminescence Models. Function version 0.1.3. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel

</td></tr>

Expand Down Expand Up @@ -114,7 +114,7 @@ <h4 align="center"> [version: 0.2.9.9000-4 ]</h4>
</td>
<td class=cellinside>Johannes Friedrich, University of Bayreuth (Germany),<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)<br />
</td>
<td class=cellinside>Friedrich, J., Kreutzer, S., 2021. model_LuminescenceSignals(): Model Luminescence Signals. Function version 0.1.5. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
<td class=cellinside>Friedrich, J., Kreutzer, S., 2021. model_LuminescenceSignals(): Model Luminescence Signals. Function version 0.1.5. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel

</td></tr>

Expand All @@ -136,7 +136,7 @@ <h4 align="center"> [version: 0.2.9.9000-4 ]</h4>
</td>
<td class=cellinside>Johannes Friedrich, University of Bayreuth (Germany),<br />
</td>
<td class=cellinside>Friedrich, J., 2021. read_SEQ2R(): Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence. Function version 0.1.0. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
<td class=cellinside>Friedrich, J., 2021. read_SEQ2R(): Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence. Function version 0.1.0. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel

</td></tr>

Expand All @@ -146,7 +146,7 @@ <h4 align="center"> [version: 0.2.9.9000-4 ]</h4>
<br>

<p class='character'><h2 align="center">Major functions in the R package 'Luminescence'</h2>
<h4 align="center"> [version: 0.2.9.9000-4 ]</h4>
<h4 align="center"> [version: 0.2.9 ]</h4>
<style type="text/css">
<!--

Expand Down Expand Up @@ -217,7 +217,7 @@ <h4 align="center"> [version: 0.2.9.9000-4 ]</h4>
</td>
<td class=cellinside>Johannes Friedrich, University of Bayreuth (Germany),<br />
</td>
<td class=cellinside>Friedrich, J., 2021. .set_pars(): Set parameters for Different Quartz Luminescence Models. Function version 0.1.3. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
<td class=cellinside>Friedrich, J., 2021. .set_pars(): Set parameters for Different Quartz Luminescence Models. Function version 0.1.3. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel

</td></tr>

Expand Down Expand Up @@ -260,7 +260,7 @@ <h4 align="center"> [version: 0.2.9.9000-4 ]</h4>
</td>
<td class=cellinside>Johannes Friedrich, University of Bayreuth (Germany),<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)<br />
</td>
<td class=cellinside>Friedrich, J., Kreutzer, S., 2021. model_LuminescenceSignals(): Model Luminescence Signals. Function version 0.1.5. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
<td class=cellinside>Friedrich, J., Kreutzer, S., 2021. model_LuminescenceSignals(): Model Luminescence Signals. Function version 0.1.5. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel

</td></tr>

Expand All @@ -282,7 +282,7 @@ <h4 align="center"> [version: 0.2.9.9000-4 ]</h4>
</td>
<td class=cellinside>Johannes Friedrich, University of Bayreuth (Germany),<br />
</td>
<td class=cellinside>Friedrich, J., 2021. read_SEQ2R(): Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence. Function version 0.1.0. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
<td class=cellinside>Friedrich, J., 2021. read_SEQ2R(): Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence. Function version 0.1.0. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel

</td></tr>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
& Name & Title & Description & Version & m.Date & m.Time & Author & Citation \\
\hline
1 & .set\_pars & Set parameters for Different Quartz Luminescence Models & This function provides all necessary model parameters to the calculation of the ODEs. & 0.1.3
& & & Johannes Friedrich, University of Bayreuth (Germany),$<$br /$>$ & Friedrich, J., 2021. .set\_pars(): Set parameters for Different Quartz Luminescence Models. Function version 0.1.3. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
& & & Johannes Friedrich, University of Bayreuth (Germany),$<$br /$>$ & Friedrich, J., 2021. .set\_pars(): Set parameters for Different Quartz Luminescence Models. Function version 0.1.3. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel
\\
2 & ExampleData.ModelOutput & Example data (TL curve) simulated with parameter set from Pagonis 2007 & Example data (TL curve) simulated with parameter set from Pagonis 2007 & 0.1.1
& & & Johannes Friedrich, University of Bayreuth (Germany)$<$br /$>$ & \\
3 & model\_LuminescenceSignals & Model Luminescence Signals & This function models luminescence signals for quartz based on published physical models. It is possible to simulate TL, (CW-) OSL, RF measurements in a arbitrary sequence. This sequence is definded as a list of certain abrivations. Furthermore it is possible to load a sequence direct from the Riso Sequence Editor. The output is an RLum.Analysis object and so the plots are done by the plot\_RLum.Analysis function. If a SAR sequence is simulated the plot output can be disabled and SAR analyse functions can be used. & 0.1.5
& & & Johannes Friedrich, University of Bayreuth (Germany),$<$br /$>$ Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)$<$br /$>$ & Friedrich, J., Kreutzer, S., 2021. model\_LuminescenceSignals(): Model Luminescence Signals. Function version 0.1.5. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
& & & Johannes Friedrich, University of Bayreuth (Germany),$<$br /$>$ Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)$<$br /$>$ & Friedrich, J., Kreutzer, S., 2021. model\_LuminescenceSignals(): Model Luminescence Signals. Function version 0.1.5. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel
\\
4 & read\_SEQ2R & Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence & A SEQ-file created by the Risoe Sequence Editor can be imported to simulate the sequence written in the sequence editor. & 0.1.0
& & & Johannes Friedrich, University of Bayreuth (Germany),$<$br /$>$ & Friedrich, J., 2021. read\_SEQ2R(): Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence. Function version 0.1.0. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9.9000-4. https://CRAN.R-project.org/package=RLumModel
& & & Johannes Friedrich, University of Bayreuth (Germany),$<$br /$>$ & Friedrich, J., 2021. read\_SEQ2R(): Parse a Risoe SEQ-file to a sequence neccessary for simulating quartz luminescence. Function version 0.1.0. In: Friedrich, J., Kreutzer, S., Schmidt, C., 2021. RLumModel: Solving Ordinary Differential Equations to Understand Luminescence. R package version 0.2.9. https://CRAN.R-project.org/package=RLumModel
\\
\hline
\end{tabular}
Expand Down
Loading

0 comments on commit a0825ba

Please sign in to comment.