Update version tag and archive v7.0 documentation

JGCRI · Jun 5, 2024 · 7671e92 · 7671e92
1 parent 1825ca0
commit 7671e92
Show file tree

Hide file tree

Showing 189 changed files with 8,486 additions and 56 deletions.
diff --git a/choice.md b/choice.md
@@ -3,7 +3,7 @@ layout: index
 title: Economic Choice in GCAM
 prev: common_assumptions.html
 next: common_assumptions.html
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 ## Introduction

diff --git a/common_assumptions.md b/common_assumptions.md
@@ -3,7 +3,7 @@ layout: index
 title: Common Assumptions
 prev: diagram.html
 next: inputs_demand.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 These assumptions are shared throughout the GCAM model.

diff --git a/community-guide.md b/community-guide.md
@@ -3,7 +3,7 @@ layout: index
 title: Community guidelines for peer-reviewed journal articles using GCAM
 prev: 
 next: 
-gcam-version: v7 
+gcam-version: v7.1
 ---
 ## Community guidelines for peer-reviewed journal articles using GCAM
 This memo outlines some ***suggested*** guidelines for the community of GCAM users to employ in peer-reviewed journal articles using GCAM or versions of GCAM. The memo focuses on two areas: i.) guidelines for co-authorship of GCAM team members in papers led by community members, and ii.) guidelines for suggested language to be used to describe GCAM in papers.

diff --git a/data-system.md b/data-system.md
@@ -3,7 +3,7 @@ layout: index
 title: The GCAM Data System
 prev: 
 next: 
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 Starting with GCAM5.1, the GCAM data system is developed as a separate R package, available on [github](https://github.com/JGCRI/gcamdata). Information on how to install and run the data system is available on the associated [wiki](https://github.com/JGCRI/gcamdata/wiki).

diff --git a/demand_energy.md b/demand_energy.md
@@ -3,7 +3,7 @@ title: "Demand for Energy"
 layout: index
 prev: inputs_demand.html
 next: outputs_quantity.html
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 # Table of Contents

diff --git a/demand_land.md b/demand_land.md
@@ -3,7 +3,7 @@ layout: index
 title: Demand for food, forestry, etc.
 prev: inputs_demand.html
 next: outputs_quantity.html
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 # Table of Contents

diff --git a/demand_water.md b/demand_water.md
@@ -3,7 +3,7 @@ layout: index
 title: Demand for Water
 prev: inputs_demand.html
 next: outputs_quantity.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 # Table of Contents

diff --git a/details_emissions.md b/details_emissions.md
@@ -3,7 +3,7 @@ layout: index
 title: Details about emissions in GCAM
 prev: emissions.html
 next: emissions.html
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 ## Calibration year differences between CEDS and GCAM

diff --git a/details_energy.md b/details_energy.md
@@ -3,7 +3,7 @@ layout: index
 title: Additional details about the energy model
 prev: supply_energy.html
 next: supply_energy.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 This page provides more detailed explanations of the descriptions provided in the [Energy Supply](supply_energy.html) and [Energy Demand](demand_energy.html) modeling pages.

diff --git a/details_inputs.md b/details_inputs.md
@@ -3,7 +3,7 @@ layout: index
 title: The GCAM Land Model
 prev: inputs_supply.html
 next: inputs_demand.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 This page provides more detailed explanations of the descriptions provided in the [inputs to supply](inputs_supply.html) and [inputs to demand](inputs_demand.html) modeling pages.

diff --git a/details_land.md b/details_land.md
@@ -3,7 +3,7 @@ layout: index
 title: The GCAM Land Model
 prev: land.html
 next: land.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 This page provides more detailed explanations of the descriptions provided in the [land](land.html) modeling page.

diff --git a/details_trade.md b/details_trade.md
@@ -3,7 +3,7 @@ layout: index
 title: Trade in GCAM
 prev: 
 next: 
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 International trade in most commodities in GCAM is done by one of three methods: (1) Heckscher-Ohlin or single global markets, (2) global trade with regionally-differentiated markets with Armington-like preferences between domestic and imported commodities, and (3) fixed interregional trade.  Other approaches for trade can also be implemented in the GCAM framework (such as [GCAM USA](gcam-usa.html) where logit based decisions are made to facilitating trade between the 50-states).

diff --git a/details_water.md b/details_water.md
@@ -3,7 +3,7 @@ layout: index
 title: The GCAM Water Model
 prev: supply_water.html
 next: supply_water.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 This page provides more detailed explanations of the descriptions provided in the [Water Supply](supply_water.html) and [Water Demand](demand_water.html) modeling pages.

diff --git a/dev-guide.md b/dev-guide.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: GCAM Developer's Guide
-gcam-version: v7
+gcam-version: v7.1
 ---
 ## GCAM Development Guide
 

diff --git a/dev-guide/additional_info.md b/dev-guide/additional_info.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: Additional Information
-gcam-version: v7
+gcam-version: v7.1
 devguide: dev-guide.html
 ---
 ## Additional Information

diff --git a/dev-guide/analysis.md b/dev-guide/analysis.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: GCAM Ecosystem of Models and Tools
-gcam-version: v7
+gcam-version: v7.1
 devguide: dev-guide.html
 ---
 ## GCAM Ecosystem of Models and Tools

diff --git a/dev-guide/debug.md b/dev-guide/debug.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: Debugging
-gcam-version: v7
+gcam-version: v7.1
 devguide: dev-guide.html
 ---
 ## Debugging: common issues

diff --git a/dev-guide/examples.md b/dev-guide/examples.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: GCAM Development Examples
-gcam-version: v7
+gcam-version: v7.1
 devguide: dev-guide.html
 ---
 ## GCAM Development Examples

diff --git a/dev-guide/getting_started.md b/dev-guide/getting_started.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: Getting Started
-gcam-version: v7
+gcam-version: v7.1
 devguide: dev-guide.html
 ---
 ## Getting Started

diff --git a/dev-guide/git.md b/dev-guide/git.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: Using Git with GCAM
-gcam-version: v7
+gcam-version: v7.1
 devguide: dev-guide.html
 ---
 ## Using Git with GCAM

diff --git a/dev-guide/rapid_parse.md b/dev-guide/rapid_parse.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: Developers guide for XML Parse via RapidXML
-gcam-version: v7 
+gcam-version: v7.1
 devguide: dev-guide.html
 ---
 

diff --git a/dev-guide/review.md b/dev-guide/review.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: GCAM Review Process
-gcam-version: v7
+gcam-version: v7.1
 devguide: dev-guide.html
 ---
 ## GCAM Review Process

diff --git a/dev-guide/style.md b/dev-guide/style.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: GCAM Style Guide
-gcam-version: v7
+gcam-version: v7.1
 devguide: dev-guide.html
 ---
 ## GCAM Style Guide

diff --git a/dev-guide/test_framework.md b/dev-guide/test_framework.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: GCAM Testing Framework
-gcam-version: v7
+gcam-version: v7.1
 devguide: dev-guide.html
 ---
 ## GCAM Testing Framework

diff --git a/economy.md b/economy.md
@@ -3,7 +3,7 @@ layout: index
 title: Economy
 prev: inputs_economy.html
 next: outputs_prices.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 # Table of Contents

diff --git a/emissions.md b/emissions.md
@@ -3,7 +3,7 @@ title: "Emissions"
 layout: index
 prev: supply_energy.html
 next: outputs_emissions.html
-gcam-version: v7
+gcam-version: v7.1
 ---
 ## Overview
 

diff --git a/en_technologies.md b/en_technologies.md
@@ -3,7 +3,7 @@ layout: index
 title: Energy Technologies
 prev: choice.html
 next: solver.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 This page documents the parameters and functional forms found within technologies in GCAM's energy system. In the heirarchy of the information in the XML input and output files, the technology is located at the following level:

diff --git a/fusion.md b/fusion.md
@@ -3,7 +3,7 @@ layout: index
 title: GCAM Fusion users guide
 prev: gcam-build.html
 next: updates.html
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 Here we discuss the GCAM Fusion API modelers tools to perform two way coupling

diff --git a/gcam-build.md b/gcam-build.md
@@ -3,7 +3,7 @@ layout: index
 title: GCAM Build Instructions
 prev: user-guide.html
 next: fusion.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 ## 1.Introduction

diff --git a/gcam-usa.md b/gcam-usa.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: GCAM-USA
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 The Global Change Analysis Model (GCAM) and GCAM-USA

diff --git a/hector.md b/hector.md
@@ -3,7 +3,7 @@ layout: index
 title: Earth System Module – Hector v3.1.1	
 prev: water.html
 next: emissions.html
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 This section describes the carbon-cycle climate module - Hector - that is available for use in GCAM. Hector v3.2.0 is the default climate model (Hartin et al. 2015 and Dorheim et al. in press) within GCAM.

diff --git a/index.md b/index.md
@@ -1,7 +1,7 @@
 ---
 layout: index
 title: Global Change Analysis Model (GCAM)
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 This documentation describes GCAM v7.0 ([![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.8010145.svg)](https://doi.org/10.5281/zenodo.8010145)
@@ -65,4 +65,5 @@ GCAM is under continuing development. Information on how this version of GCAM di
 * [GCAM-5.3](v5.3/toc.html)
 * [GCAM-5.4](v5.4/toc.html)
 * [GCAM-6.0](v6.0/toc.html)
+* [GCAM-7.0](v7.0/toc.html)
 
diff --git a/inputs_demand.md b/inputs_demand.md
@@ -3,7 +3,7 @@ layout: index
 title: Inputs for Modeling Demand
 prev: diagram.html
 next: demand_land.html
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 GCAM's demand inputs include information on consumption and prices in the historical period in order to calibrate model parameters. Additional parameters related to income and price elasticities are needed for modeling future periods. GCAM requires demand data to be globally consistent with [supply data](inputs_supply.html) for each of its historical model periods as it solves for market equilibrium in these years as it does for future years. These inputs are required for each [region](common_assumptions.html#regional-resolution) and [historical year](common_assumptions.html#historical-years).

diff --git a/inputs_economy.md b/inputs_economy.md
@@ -3,7 +3,7 @@ layout: index
 title: External Inputs for Modeling the Economy
 prev: diagram.html
 next: economy.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 GCAM's economic inputs include information on population and income. These inputs are required for each [geopolitical region](common_assumptions.html#geopolitical-regions) and [historical year](common_assumptions.html#historical-years).

diff --git a/inputs_land.md b/inputs_land.md
@@ -3,7 +3,7 @@ layout: index
 title: External Inputs to the Land Model
 prev: diagram.html
 next: land.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 GCAM's external land inputs include information on land, carbon, other emissions, and the value of unmanaged land in the historical period. These inputs are required for each [global land unit](common_assumptions.html#global-land-units) and [historical year](common_assumptions.html#historical-years).

diff --git a/inputs_supply.md b/inputs_supply.md
@@ -3,7 +3,7 @@ layout: index
 title: Inputs for Modeling Supply
 prev: diagram.html
 next: supply_land.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 GCAM's supply inputs include information on production, prices, technology cost and performance, and other emissions in the historical period in order to calibrate model parameters. In addition, GCAM's supply modeling requires information on future technology cost and performance and emissions factors for future periods. GCAM requires that supply data is globally consistent with [demand data](inputs_demand.html) for each of its historical model periods as it solves for market equilibrium in these years as it does for future years. These inputs are required for each [region](common_assumptions.html#regional-resolution) and [historical year](common_assumptions.html#historical-years).
@@ -256,4 +256,4 @@ Schematic of the restructuring of the supply-utilization accounts in GCAM to sep
 
 <a name="vernon2019">[Vernon 2019]</a> Vernon, C., M. Hejazi, S. Turner, Y. Liu, C. Braun, X. Li, and R. Link. *A Global Hydrologic Framework to Accelerate Scientific Discovery*. Journal of Open Research Software (2019). [Link](https://openresearchsoftware.metajnl.com/articles/10.5334/jors.245/)
 
-<a name="Zhao2024">[Zhao 2024]</a> Zhao, Xin, Maksym Chepeliev, Pralit Patel, Marshall Wise, Katherine Calvin, Kanishka Narayan, and Chris Vernon. "gcamfaostat: An R package to prepare, process, and synthesize FAOSTAT data for global agroeconomic and multisector dynamic modeling." Journal of Open Source Software 9, no. 96 (2024): 6388.
+<a name="Zhao2024">[Zhao 2024]</a> Zhao, Xin, Maksym Chepeliev, Pralit Patel, Marshall Wise, Katherine Calvin, Kanishka Narayan, and Chris Vernon. "gcamfaostat: An R package to prepare, process, and synthesize FAOSTAT data for global agroeconomic and multisector dynamic modeling." Journal of Open Source Software 9, no. 96 (2024): 6388.
diff --git a/land.md b/land.md
@@ -3,7 +3,7 @@ title: "The GCAM Land Allocation Module"
 layout: index
 prev: diagram.html
 next: supply_land.html
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 # Table of Contents

diff --git a/marketplace.md b/marketplace.md
@@ -3,7 +3,7 @@ layout: index
 title: Marketplace
 prev: economy.html
 next: outputs_prices.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 # Table of Contents

diff --git a/outputs_emissions.md b/outputs_emissions.md
@@ -3,7 +3,7 @@ layout: index
 title: Outputs from Emissions Modeling
 prev: emissions.html
 next: diagram.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 ## Description of Outputs

diff --git a/outputs_land.md b/outputs_land.md
@@ -3,7 +3,7 @@ layout: index
 title: Outputs from the Land Model
 prev: supply_land.html
 next: outputs_emissions.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 ## Description of Outputs

diff --git a/outputs_prices.md b/outputs_prices.md
@@ -3,7 +3,7 @@ layout: index
 title: Price Outputs
 prev: marketplace.html
 next: outputs_trade.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 ## Description of Outputs

diff --git a/outputs_quantity.md b/outputs_quantity.md
@@ -3,7 +3,7 @@ layout: index
 title: Quantity Outputs
 prev: supply_land.html
 next: outputs_prices.html
-gcam-version: v7
+gcam-version: v7.1
 ---
 
 ## Description of Outputs

diff --git a/outputs_trade.md b/outputs_trade.md
@@ -3,7 +3,7 @@ layout: index
 title: Trade Outputs
 prev: output_prices.html
 next: outputs_land.html
-gcam-version: v7 
+gcam-version: v7.1
 ---
 
 ## Description of Outputs