FTOT 2024 1 (#58)

* Add first level files including new FTOT Tools bat

* Add 2024.1 files to program folder

* Add 2024.1 files to lib folder

* Add 2024.1 files to tools folders

* Delete program/tools/xlsx_conversion_tool.py

Renamed to scenario_setup_conversion_tool.py

* Delete program/tools/FTOT_input_template.xlsx

* Delete program/tools/FTOT_input_template_examples directory

README.md

@@ -20,16 +20,17 @@ See the [Getting Started section on the FTOT landing page](https://volpeusdot.gi
 * Volpe has validated FTOT using existing datasets commonly used by public sector freight professionals. More information on the informal validation effort is available [here](https://github.com/VolpeUSDOT/FTOT-Public/blob/github_pages/docs/FTOT_Validation_2%20Pager_2022_2_final.pdf).
 
 ## Credits:
-* Dr. Kristin Lewis (Volpe) <Kristin.Lewis@dot.gov>
+* Dr. Kristin Lewis (Volpe) <FTOT-Team@dot.gov>
 * Olivia Gillham (Volpe)
 * Kirby Ledvina (Volpe)
 * Mark Mockett (Volpe)
 * Alexander Oberg (Volpe)
 * Matthew Pearlson (Volpe)
+* Tess Perrone (Volpe)
 * Kevin Zhang (Volpe)
 
 ## Project Sponsors:
-The development of FTOT that contributed to this public version was funded by the U.S. Federal Aviation Administration (FAA) Office of Environment and Energy and the Department of Defense (DOD) Office of Naval Research through Interagency Agreements (IAA) FA4SCJ and FB48CS-FB48CY under the supervision of FAA’s Nathan Brown and by the U.S. Department of Energy (DOE) Office of Policy under IAA VXS3A2 under the supervision of Zachary Clement. Any opinions, findings, conclusions or recommendations expressed in this material are those of the authors and do not necessarily reflect the views of the FAA nor of DOE.
+The development of FTOT that contributed to the original public version was funded by the U.S. Federal Aviation Administration (FAA) Office of Environment and Energy (AEE) and the Department of Defense (DOD) Office of Naval Research through Interagency Agreements (IAA) FA4SCJ and FB48CS-FB48CY under the supervision of FAA’s Nathan Brown and by the U.S. Department of Energy (DOE) Office of Policy under IAA VXS3A2 under the supervision of Zachary Clement. Current development is sponsored through IAAs with FAA AEE under the supervision of FAA's Prem Lobo. Any opinions, findings, conclusions or recommendations expressed in this material are those of the authors and do not necessarily reflect the views of the FAA nor of DOE.
 
 ## Acknowledgements:
 The FTOT team thanks our beta testers and collaborators for valuable input during the FTOT Public Release beta testing, including Dane Camenzind, Kristin Brandt, and Mike Wolcott (Washington State University), Mik Dale (Clemson University), Emily Newes and Ling Tao (National Renewable Energy Laboratory), Seckin Ozkul, Robert Hooker, and George Philippides (Univ. of South Florida), and Chris Ringo (Oregon State University).

changelog.md

@@ -1,5 +1,23 @@
 # FTOT Change Log
 
+## v2024_1
+
+The FTOT 2024.1 public release includes updates related to the pipeline network, waterway background volume and capacity handling, FTOT Tools and the Scenario Setup Template, the Tableau routes dashboard, and network resilience analysis. The following changes have been made:
+* The default FTOT multimodal network has been refreshed to incorporate updated pipeline tariff data for crude and petroleum products effective as of January 2024. Aside from updated tariff costs, some pipeline tariffs that are no longer effective have been removed, and others that are newly effective or have been newly geolocated have been added.
+* Updated the optimization problem to enable use of lock volumes, capacity, and volume/capacity ratio attributes. Lock data are applied to adjacent waterway links when available and when capacity and/or background flows are enabled for the water network. Added a “locks” feature class schema to the FTOT network specification and improved documentation to clarify how waterway capacity and background volumes can be applied to the network.
+* Renamed the XLSX-based Scenario Setup Template and complementary Scenario Setup Conversion Tool, which provide a user-friendly process for entering scenario data into corresponding FTOT input files. Additional input data validation has been added to confirm required data have been entered. The tool currently does not create required GIS inputs or optional CSV files. Example XLSX workbooks included with the FTOT codebase have been updated. A tutorial video explaining how to fill out the template and run the conversion tool has been published on the FTOT landing page. See the User Guide for more information.
+* Updated default values for modal base transport costs in the scenario XML to align with 2020 data published by BTS.
+* Redesigned and added CO2 emissions to the Tableau routes dashboard, which is generated when scenarios are run with network density reduction (NDR) turned on.
+* Aligned the FTOT rank and removal tool with FTOT version 2024.1. Refactored for usability and added new visualizations to the output HTML report.
+* Other updates:
+  * Added a BAT file to launch FTOT Tools.
+  * Fixed a bug in generating the Tableau routes dashboard in scenario comparison workbooks.
+  * Removed the “network used” metric from the Tableau dashboard to ensure consistency across reports.
+  * Removed ArcGIS dependency from scenarios that leverage multiprocessing (a potential cause of license-related crashes of FTOT).
+  * Removed use of intermediate shapefiles in converting the GIS-based FTOT network to a NetworkX graph.
+See documentation files for additional details.
+
+
 ## v2023_4
 
 The FTOT 2023.4 public release includes updates related to scenario input validation, FTOT tools for data preparation and validation, reporting metrics, and network resilience testing. The following changes have been made:

program/ftot.py

@@ -27,9 +27,9 @@
     ureg.define('us_ton = US_ton')
 
 
-FTOT_VERSION = "2023.4"
-SCHEMA_VERSION = "7.0.3"
-VERSION_DATE = "1/5/2024"
+FTOT_VERSION = "2024.1"
+SCHEMA_VERSION = "7.0.4"
+VERSION_DATE = "4/3/2024"
 
 # ===================================================================================================