Forgot your password?
New user?
Next LANDIS-II Meeting: January 2012
Dual-scale Libraries and Extensions
Versions of the libraries and extensions that have been modified for Dual-Scale LANDIS-II.
| Category | Name | Version in svn repository | ||
|---|---|---|---|---|
| trunk | dual-scale branch |
|||
| L-II 5.1 core (a) | L-II 6.0 core | |||
| FLEL Libraries | Util | 1.1 (5.1) 1.2 (b) |
1.2 | 1.2 |
| Grids | 1.0 (5.1) | - | - | |
| Geospatial Modeling | - | 1.0 | 1.0 | |
| L-II Libraries | Age cohorts | 2.0 (5.1) | 2.1 | 2.1 |
| Succession | 2.0 (5.1) 2.1 (bio exts 1.1) 2.2 (bio exts 1.2) 2.3 (bio exts 1.2.1) |
3.0 | 3.0 | |
| test-util / core | 1.0 | 2.0 2.1 (c) |
2.1 | |
| test-util / age-cohort | 1.0 | 2.0 | 2.0 | |
| Extensions | Age-only Succession | 1.1 (5.1) 1.2 (5.1 SP1) |
2.0 | 2.0 |
| Base Harvest | 1.0 | 2.0 | 2.0 | |
| Max Species Age | 1.1 (5.1) | 2.0 | 2.0 | |
Notes
(a) - "(package)" indicates the package that included the component: "(5.1)" = L-II 5.1 ; "(5.1 SP1)" = Service Pack 1 for L-II 5.1 ; "(bio exts ...)" = Biomass Extensions
(b) - Updated for FLEL build system 4.0 (which was renamed FLEL Developer's Kit; see below).
(c) - The site-variable registry methods in the MockCore class were made virtual so that they can be overridden in derived classes.
Dual-scale Branch and Version
The dual-scale (DS) version of a component (library or extension) is developed on a separate branch in the Subversion repository. The branch is always named "dual-scale".
The right-most column in the table above shows the DS version of a component. This DS version is the same as the version of the component that's built for or built with the L-II 6.0 core. Components are updated for the 6.0 core because the 6.0 architecture facilitated the changes needed for dual-scale.
Before creating the "dual-scale" branch for a component in the svn repository, its trunk is updated for the 6.0 core.
(TO DO: create page for 6.0 core and its architecture; add link to page)
Geospatial Modeling Library
One of the changes between the 5.x and 6.x architectures is the Geospatial Modeling library. The Landscape and Raster-I/O modules in the L-II 5.x core have been moved into this separate library because they are not unique to LANDIS-II.
The Geospatial Modeling library hadn't been started by the time that L-II 5.1 was ready for release. So as interim solution, the Grids submodule in the Landscape module in L-II 5.0 was relocated into its own separate library. This library was replaced with the Geospatial Modeling library for the 6.0 core.
FLEL Developer's Kit
The FLEL build system (version 3.x) is used to build components for the 5.1 core. Because the system's next major version (4.0) is used for other tasks besides building, it has been renamed the FLEL Developer's Kit (dev-kit). (TO DO: need a page about dev-kit) All the component versions for the 6.0 architecture are built with the FLEL dev-kit (and hence, so are the DS versions).
Branch Strategy for Components
A component's version number is advanced to the next major version when the componet is updated for the 6.0 core. For example, Max Species Age went from 1.1 to 2.0.
This permits more minor versions of an extension to be released if need be before L-II 6.0 is ready. In that situation, these additional minor versions must developed on a separate branch. The branch should be named after the minor version on the trunk where the branch is created. For example, if Max Species Age 1.2 (or 1.1.1) needs to be released, then a branch off its trunk would be created at version 1.1. This branch would be called "v1.x-after-1.1" to indicate that all versions in the 1.x series after version 1.1 are on the branch.
Max Species Age - Branching diagrams
