Needs updates to Climate Library 5

LANDIS-II-Foundation · Sep 22, 2024 · abaff70 · abaff70
1 parent 1108a4c
commit abaff70
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 81 deletions.
diff --git a/deploy/installer/Output Landscape Habitat 2.0.iss b/deploy/installer/Output Landscape Habitat 2.0.iss
@@ -50,17 +50,9 @@ Source: {#BuildDir}\Landis.Extension.Output.LandscapeHabitat.dll; DestDir: {#Ext
 
 ; Requisite auxiliary libraries
 ; NB. These libraries are used by other extensions and thus are never uninstalled.
-Source: {#BuildDir}\Landis.Library.UniversalCohorts-v1.dll; DestDir: {#ExtDir}; Flags: uninsneveruninstall ignoreversion
-Source: {#BuildDir}\Landis.Library.Metadata-v2.dll; DestDir: {#ExtDir}; Flags: uninsneveruninstall ignoreversion
-Source: {#BuildDir}\Landis.Library.Climate-v4.4.dll; DestDir: {#ExtDir}; Flags: uninsneveruninstall ignoreversion
-
-; Complete example for testing the extension
-Source: ..\examples\*.txt; DestDir: {#AppDir}\examples\{#ExtensionName}; Flags: ignoreversion
-Source: ..\examples\*.gis; DestDir: {#AppDir}\examples\{#ExtensionName}; Flags: ignoreversion skipifsourcedoesntexist
-Source: ..\examples\*.img; DestDir: {#AppDir}\examples\{#ExtensionName}; Flags: ignoreversion skipifsourcedoesntexist
-Source: ..\examples\*.bat; DestDir: {#AppDir}\examples\{#ExtensionName}; Flags: ignoreversion skipifsourcedoesntexist
-Source: ..\examples\*.csv; DestDir: {#AppDir}\examples\{#ExtensionName}; Flags: ignoreversion skipifsourcedoesntexist
-
+; Source: {#BuildDir}\Landis.Library.UniversalCohorts-v1.dll; DestDir: {#ExtDir}; Flags: uninsneveruninstall ignoreversion
+; Source: {#BuildDir}\Landis.Library.Metadata-v2.dll; DestDir: {#ExtDir}; Flags: uninsneveruninstall ignoreversion
+; Source: {#BuildDir}\Landis.Library.Climate-v5.dll; DestDir: {#ExtDir}; Flags: uninsneveruninstall ignoreversion
 
 ; LANDIS-II identifies the extension with the info in this .txt file
 ; NB. New releases must modify the name of this file and the info in it

diff --git a/docs/index.md b/docs/index.md
@@ -6,7 +6,7 @@ This extension is differentiated from the [Local Habitat Suitability Output](htt
 
 # Release Notes
 
-- Latest official release: Version 2.0 — October 2024
+- Latest official release: Version 2.0 — September 2024
 - [View User Guide](https://github.com/LANDIS-II-Foundation/Extension-Output-Bird-Habitat/blob/master/docs/LANDIS-II%20Landscape%20Habitat%20Output%20v2%20User%20Guide.pdf).
 - Full release details found in the User Guide and on GitHub.
 - Copyright The LANDIS-II Foundation
@@ -18,7 +18,7 @@ To use Landscape Habitat Output, you need:
 - The [LANDIS-II model v8.0](http://www.landis-ii.org/install) installed on your computer.
 - Example files (see below)
 
-# Download
+# Download and Install the Extension
 
 The latest version can be downloaded [here](https://github.com/LANDIS-II-Foundation/Extension-Output-Bird-Habitat/blob/master/deploy/installer/LANDIS-II-V8%20Output%20Landscape%20Habitat%202.0-setup.exe). (Look for the download icon in the upper right corner.) Launch the installer.
 

diff --git a/src/ClimateVariableDefinition.cs b/src/ClimateVariableDefinition.cs
@@ -73,7 +73,7 @@ int MaxMonth
         /// <summary>
         /// Climate Data
         /// </summary>
-        AnnualClimate_Monthly ClimateData
+        AnnualClimate ClimateData
         {
             get;
             set;
@@ -102,7 +102,7 @@ public class ClimateVariableDefinition
         private string year;
         private int minMonth;
         private int maxMonth;
-        private AnnualClimate_Monthly climateData;
+        private AnnualClimate climateData;
         private string transform;
         //---------------------------------------------------------------------
 
@@ -218,7 +218,7 @@ public int MaxMonth
         /// <summary>
         /// Climate Data
         /// </summary>
-        public AnnualClimate_Monthly ClimateData
+        public AnnualClimate ClimateData
         {
             get
             {

diff --git a/src/NuGet.Config b/src/NuGet.Config
@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="landis-ii-v7" value="https://www.myget.org/F/landis-ii-v7/api/v3/index.json" />
+    <add key="landis-ii-v8" value="https://www.myget.org/F/landis-ii-v8/api/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/PlugIn.cs b/src/PlugIn.cs
@@ -1,17 +1,13 @@
-//  Copyright 2005-2010 Portland State University, University of Wisconsin-Madison
-//  Authors:  Robert M. Scheller, Jimm Domingo
 
 using Landis.Core;
 using Landis.Library.UniversalCohorts;
 using Landis.SpatialModeling;
 using Landis.Library.Metadata;
 using System.Collections.Generic;
 using System;
-using System.Text.RegularExpressions;
 using Landis.Library.Climate;
 using System.Linq;
 using System.Data;
-using System.IO;
 
 
 namespace Landis.Extension.Output.LandscapeHabitat
@@ -563,7 +559,7 @@ public override void Run()
                     }
                     if (Climate.Future_MonthlyData != null)
                     {
-                        AnnualClimate_Monthly AnnualWeather = Climate.Future_MonthlyData[Climate.Future_MonthlyData.Keys.Min()][firstActiveEco];
+                        AnnualClimate AnnualWeather = Climate.Future_MonthlyData[Climate.Future_MonthlyData.Keys.Min()][firstActiveEco];
                         int maxSpinUpYear = Climate.Spinup_MonthlyData.Keys.Max();
 
                         if (PlugIn.ModelCore.CurrentTime > 0)

diff --git a/src/SiteVars.cs b/src/SiteVars.cs
@@ -1,7 +1,3 @@
-//  Copyright 2005-2010 Portland State University, University of Wisconsin-Madison
-//  Authors:  Robert M. Scheller, Jimm Domingo
-
-using Landis.Core;
 using Landis.SpatialModeling;
 using Landis.Library.UniversalCohorts;
 using System.Collections.Generic;
@@ -10,7 +6,7 @@ namespace Landis.Extension.Output.LandscapeHabitat
 {
     public static class SiteVars
     {
-        private static ISiteVar<ISiteCohorts> cohorts;
+        private static ISiteVar<SiteCohorts> cohorts;
         private static ISiteVar<Dictionary<string,int>> localVars;
         private static ISiteVar<Dictionary<string, float>> derivedVars;
         private static ISiteVar<Dictionary<string, float>> neighborVars;
@@ -22,7 +18,7 @@ public static class SiteVars
 
         public static void Initialize()
         {
-            cohorts = PlugIn.ModelCore.GetSiteVar<ISiteCohorts>("Succession.UniversalCohorts");
+            cohorts = PlugIn.ModelCore.GetSiteVar<SiteCohorts>("Succession.UniversalCohorts");
 
             if (cohorts == null)
             {
@@ -48,7 +44,7 @@ public static void Initialize()
         }
 
         //---------------------------------------------------------------------
-        public static ISiteVar<ISiteCohorts> Cohorts
+        public static ISiteVar<SiteCohorts> Cohorts
         {
             get
             {

diff --git a/src/lib/support_libs_download.ps1 b/src/lib/support_libs_download.ps1
@@ -7,7 +7,7 @@ $master = "https://github.com/LANDIS-II-Foundation/Support-Library-Dlls-v8/raw/m
 # Modify here when any dependencies changed 
 
 $dlls = "Landis.Library.UniversalCohorts-v1.dll",
-"Landis.Library.Climate-v4.4.dll",
+"Landis.Library.Climate-v5.dll",
 "Landis.Library.Metadata-v2.dll"
 #************************************************
 

diff --git a/src/output-bird-habitat.csproj b/src/output-bird-habitat.csproj
diff --git a/src/output-landscape-habitat.csproj b/src/output-landscape-habitat.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <RootNamespace>Landis.Extension.Output.LandscapeHabitat</RootNamespace>
+    <AssemblyName>Landis.Extension.Output.LandscapeHabitat-v2</AssemblyName>
+    <AssemblyTitle>Landis.Extension.Output.LandscapeHabitat-v2</AssemblyTitle>
+    <AssemblyCompany>USDA Forest Service</AssemblyCompany>
+    <AssemblyProduct>Landis.Extension.Output.LandscapeHabitat-v2</AssemblyProduct>
+    <AssemblyCopyright>The LANDIS-II Foundation</AssemblyCopyright>
+    <AssemblyVersion>2.0</AssemblyVersion>
+	  <FileVersion>2.0.0.0</FileVersion>
+	  <Version>2.0</Version>
+	  <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <RepositoryUrl>https://github.com/LANDIS-II-Foundation/Extension-Output-Landscape-Habitat</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseUrl>https://github.com/LANDIS-II-Foundation/Extension-Output-Landscape-Habitat/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>http://www.landis-ii.org</PackageProjectUrl>
+    <NeutralLanguage>English</NeutralLanguage>
+    <Authors>USDA Forest Service</Authors>
+    <Product>Landis.Extension.Output.LandscapeHabitat-v2</Product>
+    <Copyright>The LANDIS-II Foundation</Copyright>
+    <PackageTags>LANDIS-II;Landis;Extension;Output Landscape Habitat</PackageTags>
+    <Description>Extension Output Landscape Habitat</Description>
+    <PackageReleaseNotes>LANDIS-II v8 update.</PackageReleaseNotes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Landis.Core" Version="3.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Landis.Library.Climate-v5">
+    </Reference>
+    <Reference Include="Landis.Library.UniversalCohorts-v1">
+    </Reference>
+    <Reference Include="Landis.Library.Metadata-v2">
+      <HintPath>lib\Landis.Library.Metadata-v2.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+</Project>
+