Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4406f26
met2model stub for RCMEM.
HolmquistJ May 4, 2026
11ae616
Merge pull request #6 from abbylewis/peprmt_met
HolmquistJ May 4, 2026
c712037
Uploaded example files for inputs and outputs.
HolmquistJ May 12, 2026
8262909
Added Kopp et al 2014 sea level rise scenarios.
HolmquistJ May 13, 2026
bd5dfc7
Updated standardized variable list.
HolmquistJ Jun 3, 2026
650dcfe
Finished RCMEM model to netcdf.
HolmquistJ Jun 3, 2026
14037fe
Working on write configs.
HolmquistJ Jun 19, 2026
19279e8
The write utils function is working on its own. At least outside of t…
HolmquistJ Jun 19, 2026
7cb4e28
Made some updates to the workflow to account for the C flux function.
HolmquistJ Jul 14, 2026
3c3c762
Got demo to run in code after fixing dependency issue in package.
HolmquistJ Jul 14, 2026
00224ef
Updated changelog and citation
HolmquistJ Jul 14, 2026
95f94b8
Made progress on data.water package.
HolmquistJ Jul 15, 2026
b62b90a
Added skeleton of package scripts. Added long term tidal constituents…
HolmquistJ Jul 20, 2026
2815792
Tinkering with the scenario generating in water data module.
HolmquistJ Jul 30, 2026
5b75bb7
Added some example HMC data scenario.
HolmquistJ Aug 4, 2026
d6e9b4e
Draft of a function for fetching and assembling sea level rise and ti…
HolmquistJ Aug 5, 2026
84716a9
Added to water.level package.
HolmquistJ Aug 11, 2026
caf937a
Fixed internal links to datasets.
HolmquistJ Aug 11, 2026
580d5aa
Fixed another internal link.
HolmquistJ Aug 11, 2026
5746d1e
Created a vignette for new script for generating tidal scenarios.
HolmquistJ Aug 11, 2026
c15fee1
Bug fix on generate full tidal scenario.
HolmquistJ Aug 11, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,4 @@ dbfiles/
**/temperate.coniferous/
*.sensitivity.analysis.*.pdf
*.variance.decomposition.*.pdf
models/rcmem/R/water_level_functions/data/Kopp_2014_projections_long.csv
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ For more information about this file see also [Keep a Changelog](http://keepacha
## Unreleased

### Added
- Added PEcAn.RCMEM model, no demo run yet, just an initial pull request
- Added PEcAn.PEPRMT model, including a demo run with example data
- Add `format_try_for_ma()` and `try_trait_mapping()` to `PEcAn.data.remote` to convert trait data from the external TRY database into the tabular format required by the PEcAn meta-analysis module (#3717).
- Add function `qsub_sda()` for submitting SDA batch jobs by splitting a large number of sites into multiple small groups of sites (#3634).
Expand Down
3 changes: 3 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ authors:
affiliation: National Institute of Technology, Tiruchirappalli
- given-names: Om Kapale
affiliation: Chatrapati Shahu Maharaj CSCOE, Maharashtra
- given-names: James R Holmquist
affiliation: Smithsonian Environmental Research Center
orcid: 'https://orcid.org/0000-0003-2546-6766'


preferred-citation:
Expand Down
253 changes: 132 additions & 121 deletions base/utils/data/standard_vars.csv

Large diffs are not rendered by default.

Binary file not shown.
Binary file modified models/peprmt/demo_run/data/pfts/default_mcmc/trait.mcmc.RData
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
runtype : ensemble
workflow id : 2026-05-04-12-23-39
ensemble id : 6fe7391ab410e3cf22e79721d1461505
run : 1 / 10
run id : ENS-00001-US_DMG
pft names : default default_mcmc
model : PEPRMT
model id : peprmt_0_1_0
site : US_DMG
site id : US_DMG
met : data/met/ERA5_38N_121.5W/ERA5.8.2021-12-15.2024-12-19.dat
start date : 2021-12-15
end date : 2024-12-19
hostname : localhost
rundir : /Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/run/ENS-00001-US_DMG
outdir : /Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/out/ENS-00001-US_DMG
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/usr/bin/env bash


mkdir -p /Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/out/ENS-00001-US_DMG

# Redirect output
exec 3>&1
exec &> "$(realpath /Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/out/ENS-00001-US_DMG)/logfile.txt"

# host specific setup


# cdo setup
# @CDO_SETUP@

# Run PEPRMT
Rscript \
-e 'dat <- read.csv(file.path("/Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/run/ENS-00001-US_DMG", "run_data.csv"))' \
-e 'res <- do.call(PEPRMT::run_PEPRMT, c(list(a0 = 0.744082512141497, a1 = 1.15544289485085, Ha = 119.589297901609, Hd = 93.6537118831357, Ea_SOM = 17.6939861598126, kM_SOM = 9907.39505784586, Ea_labile = 10.4679888669531, kM_labile = 94.4321891176514, Ea_SOM_CH4 = 83.3468674710418, kM_SOM_CH4 = 20.6126951904004, Ea_labile_CH4 = 87.3040938196751, kM_labile_CH4 = 21.0943910116999, Ea_oxi_CH4 = 91.3871460132901, kM_oxi_CH4 = 23.2262669730873, kI_SO4 = 100.248951010205, kI_NO3 = 2.46019191158601, wetland_type = 2),
list(data = dat)
))' \
-e 'write.csv(res, file.path("/Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/out/ENS-00001-US_DMG", "out.csv"), row.names = FALSE)'

# convert output to PEcAn format
Rscript -e 'PEcAn.PEPRMT::model2netcdf.PEPRMT(
outdir = "/Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/out/ENS-00001-US_DMG",
sitelat = 38.0015,
sitelon = -121.6691,
start_date = "2021-12-15",
end_date = "2024-12-19",
delete_raw = FALSE
)'
1,102 changes: 1,102 additions & 0 deletions models/peprmt/demo_run/input_demo_mcmc_out/run/ENS-00001-US_DMG/run_data.csv

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
runtype : ensemble
workflow id : 2026-05-04-12-23-39
ensemble id : 41e0ce8fdf11e1ba6e84415388012ec8
run : 1 / 10
run id : ENS-00001-US_EDN
pft names : default default_mcmc
model : PEPRMT
model id : peprmt_0_1_0
site : US_EDN
site id : US_EDN
met : data/met/ERA5_37.5N_122W/ERA5.8.2018-04-03.2021-06-16.dat
start date : 2018-04-03
end date : 2021-06-16
hostname : localhost
rundir : /Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/run/ENS-00001-US_EDN
outdir : /Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/out/ENS-00001-US_EDN
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/usr/bin/env bash


mkdir -p /Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/out/ENS-00001-US_EDN

# Redirect output
exec 3>&1
exec &> "$(realpath /Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/out/ENS-00001-US_EDN)/logfile.txt"

# host specific setup


# cdo setup
# @CDO_SETUP@

# Run PEPRMT
Rscript \
-e 'dat <- read.csv(file.path("/Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/run/ENS-00001-US_EDN", "run_data.csv"))' \
-e 'res <- do.call(PEPRMT::run_PEPRMT, c(list(a0 = 0.744082512141497, a1 = 1.15544289485085, Ha = 119.589297901609, Hd = 93.6537118831357, Ea_SOM = 17.6939861598126, kM_SOM = 9907.39505784586, Ea_labile = 10.4679888669531, kM_labile = 94.4321891176514, Ea_SOM_CH4 = 83.3468674710418, kM_SOM_CH4 = 20.6126951904004, Ea_labile_CH4 = 87.3040938196751, kM_labile_CH4 = 21.0943910116999, Ea_oxi_CH4 = 91.3871460132901, kM_oxi_CH4 = 23.2262669730873, kI_SO4 = 100.248951010205, kI_NO3 = 2.46019191158601, wetland_type = 2),
list(data = dat)
))' \
-e 'write.csv(res, file.path("/Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/out/ENS-00001-US_EDN", "out.csv"), row.names = FALSE)'

# convert output to PEcAn format
Rscript -e 'PEcAn.PEPRMT::model2netcdf.PEPRMT(
outdir = "/Users/jamesholmquist/GitHub/pecan/models/peprmt/demo_run/input_demo_mcmc_out/out/ENS-00001-US_EDN",
sitelat = 37.615,
sitelon = -122.114,
start_date = "2018-04-03",
end_date = "2021-06-16",
delete_raw = FALSE
)'
Loading