From 6a758e1af67e898dc3a0c8ec7956fcabdd1278b7 Mon Sep 17 00:00:00 2001 From: Robert Scheller Date: Sat, 14 Sep 2024 11:31:57 -0400 Subject: [PATCH] resolving merge conflicts --- .gitignore => .gitignore.save | 0 .../LANDIS-II-V7 SCRAPPLE 3.2.2-setup.exe | Bin deploy/{installer => previous}/Scrapple 3.iss | 0 docs/{index.md => index.md.save} | 100 +++++++++--------- 4 files changed, 50 insertions(+), 50 deletions(-) rename .gitignore => .gitignore.save (100%) rename deploy/{installer => previous}/LANDIS-II-V7 SCRAPPLE 3.2.2-setup.exe (100%) rename deploy/{installer => previous}/Scrapple 3.iss (100%) rename docs/{index.md => index.md.save} (98%) diff --git a/.gitignore b/.gitignore.save similarity index 100% rename from .gitignore rename to .gitignore.save diff --git a/deploy/installer/LANDIS-II-V7 SCRAPPLE 3.2.2-setup.exe b/deploy/previous/LANDIS-II-V7 SCRAPPLE 3.2.2-setup.exe similarity index 100% rename from deploy/installer/LANDIS-II-V7 SCRAPPLE 3.2.2-setup.exe rename to deploy/previous/LANDIS-II-V7 SCRAPPLE 3.2.2-setup.exe diff --git a/deploy/installer/Scrapple 3.iss b/deploy/previous/Scrapple 3.iss similarity index 100% rename from deploy/installer/Scrapple 3.iss rename to deploy/previous/Scrapple 3.iss diff --git a/docs/index.md b/docs/index.md.save similarity index 98% rename from docs/index.md rename to docs/index.md.save index 2754c4f..2f888a7 100644 --- a/docs/index.md +++ b/docs/index.md.save @@ -1,50 +1,50 @@ -# What is the SCRPPLE Extension? - -The purpose of the Social-Climate Related Pyrogenic Processes and their Landscape Effects (SCRPPLE) is to simulate fire regime change due to climatic and social factors. The climate is represented primarily via a Fire Weather Index. Social processes are represented as explicit representation of suppression, accidental ignitions, and prescribed fire. Human manipulation of the vegetation is represented through fine fuels and ladder fuels. SCRPPLE uses a very 'data first' philosophy: The primary mechanisms (ignition, spread, site mortality, and cohort mortality) are parameterized via statistical analyses of landscape-scale data. - -# Citation - -Scheller, R.M., A. Kretchun, T.J. Hawbaker, P.D. Henne. 2019. A landscape model of variable social-ecological fire regimes. Ecological Modelling 401: 85-93. - -# Release Notes - -- Latest release: Version 3.2.2 — May 2022 -- Full release details found in the User Guide and on GitHub. -- [View User Guide](https://github.com/LANDIS-II-Foundation/Extension-SCRPPLE/blob/master/docs/LANDIS-II%20SCRAPPLE%20v3.2%20User%20Guide.pdf). -- SCRPPLE depends on the Climate Library, see: [User Guide for Climate Library](https://github.com/LANDIS-II-Foundation/Library-Climate/blob/master/docs/LANDIS-II%20Climate%20Library%20v4.2%20User%20Guide.pdf) - -- Copyright: The LANDIS-II Foundation - -# Requirements - -You need: - -- The [LANDIS-II model v7.0](http://www.landis-ii.org/install) installed on your computer. -- Example files (see below) - -# Download - -- The latest version of SCRPPLE can be [downloaded from GitHub](https://github.com/LANDIS-II-Foundation/Extension-SCRPPLE/blob/master/deploy/installer/LANDIS-II-V7%20SCRAPPLE%203.2.3-setup.exe). To install it on your computer, launch the installer. - -# Example Files - -LANDIS-II requires a global parameter file for your scenario, and separate parameter files for each extension. - -Example files can be [downloaded from GitHub](https://downgit.github.io/#/home?url=https://github.com/LANDIS-II-Foundation/Extension-SCRPPLE/tree/master/Testing/Core7-SCRAPPLE3.2). - -# Supporting R-Code - -We also provide R-code that has been used to parameterize SCRPPLE. This R-code is provided 'as is' and no support is implied. [R code on GitHub](https://downgit.github.io/#/home?url=https://github.com/LANDIS-II-Foundation/Extension-SCRPPLE/tree/master/Supporting%20R%20Code) - -# Support - -If you have a question, please contact Robert Scheller. -You can also ask for help in the [LANDIS-II users group](http://www.landis-ii.org/users). - -If you come across any issue or suspected bug, please post about it in the [issue section of the Github repository](https://github.com/LANDIS-II-Foundation/Extension-SCRPPLE/issues) (GitHub ID required). - -# Author - -[The LANDIS-II Foundation](http://www.landis-ii.org) - -Mail : rschell@ncsu.edu +# What is the SCRPPLE Extension? + +The purpose of the Social-Climate Related Pyrogenic Processes and their Landscape Effects (SCRPPLE) is to simulate fire regime change due to climatic and social factors. The climate is represented primarily via a Fire Weather Index. Social processes are represented as explicit representation of suppression, accidental ignitions, and prescribed fire. Human manipulation of the vegetation is represented through fine fuels and ladder fuels. SCRPPLE uses a very 'data first' philosophy: The primary mechanisms (ignition, spread, site mortality, and cohort mortality) are parameterized via statistical analyses of landscape-scale data. + +# Citation + +Scheller, R.M., A. Kretchun, T.J. Hawbaker, P.D. Henne. 2019. A landscape model of variable social-ecological fire regimes. Ecological Modelling 401: 85-93. + +# Release Notes + +- Latest release: Version 3.2.2 — May 2022 +- Full release details found in the User Guide and on GitHub. +- [View User Guide](https://github.com/LANDIS-II-Foundation/Extension-SCRPPLE/blob/master/docs/LANDIS-II%20SCRAPPLE%20v3.2%20User%20Guide.pdf). +- SCRPPLE depends on the Climate Library, see: [User Guide for Climate Library](https://github.com/LANDIS-II-Foundation/Library-Climate/blob/master/docs/LANDIS-II%20Climate%20Library%20v4.2%20User%20Guide.pdf) + +- Copyright: The LANDIS-II Foundation + +# Requirements + +You need: + +- The [LANDIS-II model v7.0](http://www.landis-ii.org/install) installed on your computer. +- Example files (see below) + +# Download + +- The latest version of SCRPPLE can be [downloaded from GitHub](https://github.com/LANDIS-II-Foundation/Extension-SCRPPLE/blob/master/deploy/installer/LANDIS-II-V7%20SCRAPPLE%203.2.3-setup.exe). To install it on your computer, launch the installer. + +# Example Files + +LANDIS-II requires a global parameter file for your scenario, and separate parameter files for each extension. + +Example files can be [downloaded from GitHub](https://downgit.github.io/#/home?url=https://github.com/LANDIS-II-Foundation/Extension-SCRPPLE/tree/master/Testing/Core7-SCRAPPLE3.2). + +# Supporting R-Code + +We also provide R-code that has been used to parameterize SCRPPLE. This R-code is provided 'as is' and no support is implied. [R code on GitHub](https://downgit.github.io/#/home?url=https://github.com/LANDIS-II-Foundation/Extension-SCRPPLE/tree/master/Supporting%20R%20Code) + +# Support + +If you have a question, please contact Robert Scheller. +You can also ask for help in the [LANDIS-II users group](http://www.landis-ii.org/users). + +If you come across any issue or suspected bug, please post about it in the [issue section of the Github repository](https://github.com/LANDIS-II-Foundation/Extension-SCRPPLE/issues) (GitHub ID required). + +# Author + +[The LANDIS-II Foundation](http://www.landis-ii.org) + +Mail : rschell@ncsu.edu