diff --git a/INSTALL.md b/INSTALL.md deleted file mode 100644 index f92433f..0000000 --- a/INSTALL.md +++ /dev/null @@ -1,26 +0,0 @@ -# turb_sci_gate -Turbine Science Gateway - -## StandAlone Deployment: Installing TurbineLite with FOQUS - -### Install GIT: -Open anaconda terminal and type -``` -conda install git -``` -### Install turb_client -``` - >pip install git+https://github.com/CCSI-Toolset/turb_client@master - >pip install git+https://$USERNAME:$PASSWORD@github.com/CCSI-Toolset/foqus@master -``` -## TurbineLite Dependencies -### Install SQL Compact 4.0 x64 ( MUST INSTALL 64 bit on x64 platform ) -### Install SimSinterInstaller.msi -### Install TurbineLite.msi - -## Cluster deployment -### Configure TurbineLite to run FOQUS Flowsheets -Run FOQUS to setup working directory, etc -``` -(base) C:\Users\Administrator>\ProgramData\Anaconda2\python.exe \ProgramData\Anaconda2\Scripts\foqus.py --nogui —addTurbineApp focus -``` diff --git a/LICENSE.md b/LICENSE.md index c253564..1d2e7fd 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,19 +1,19 @@ Copyright and License ===================== -Copyright (c) 2012 - 2019 +Copyright (c) 2012 - 2021 Copyright Notice ---------------- -Turbine Science Gateway was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2019 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy & Construction, Inc., et al.. All rights reserved. +Turbine Science Gateway was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2021 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy & Construction, Inc., et al.. All rights reserved. NOTICE. This Software was developed under funding from the U.S. Department of Energy and the U.S. Government consequently retains certain rights. As such, the U.S. Government has been granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, distribute copies to the public, prepare derivative works, and perform publicly and display publicly, and to permit other to do so. License Agreement ----------------- -Turbine Science Gateway Copyright (c) 2012 - 2019, by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy & Construction, Inc., et al. All rights reserved. +Turbine Science Gateway Copyright (c) 2012 - 2021, by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy & Construction, Inc., et al. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/LICENSE.rtf b/LICENSE.rtf index 3ce3951..b98f1ec 100644 Binary files a/LICENSE.rtf and b/LICENSE.rtf differ diff --git a/Master/Turbine.Data.Contract.Behaviors/Turbine.Data.Contract.Behaviors.csproj b/Master/Turbine.Data.Contract.Behaviors/Turbine.Data.Contract.Behaviors.csproj index bf035ed..2fea69e 100644 --- a/Master/Turbine.Data.Contract.Behaviors/Turbine.Data.Contract.Behaviors.csproj +++ b/Master/Turbine.Data.Contract.Behaviors/Turbine.Data.Contract.Behaviors.csproj @@ -31,7 +31,14 @@ 4 + + ..\..\SharedDatabaseArchitecture\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll + + + ..\..\SharedDatabaseArchitecture\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll + + @@ -44,6 +51,10 @@ + + + + @@ -203,144 +194,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + --> - - Installed OR ( PROP.SIM_SINTER = "SimSinter" AND PROP.SIM_SINTER_MAJOR = "#1" AND PROP.SIM_SINTER_MINOR > "#3") OR ( PROP.SIM_SINTER7.3 = "SimSinter_Aspen7.3" AND PROP.SIM_SINTER7.3_MAJOR = "#1" AND PROP.SIM_SINTER7.3_MINOR > "#3") + + Installed OR ( PROP.SIM_SINTER = "SimSinter" AND PROP.SIM_SINTER_MAJOR = "#2" AND PROP.SIM_SINTER_MINOR > "#0") @@ -1026,48 +853,28 @@ - - - - - - - - - - - - - Installed OR ( PROP.SIM_SINTER = "SimSinter" AND PROP.SIM_SINTER_MAJOR = "#1" AND PROP.SIM_SINTER_MINOR > "#3") - - - - - - - + - + - Installed OR ( PROP.SIM_SINTER7.3 = "SimSinter_Aspen7.3" AND PROP.SIM_SINTER7.3_MAJOR = "#1" AND PROP.SIM_SINTER7.3_MINOR > "#3") + Installed OR ( PROP.SIM_SINTER = "SimSinter" AND PROP.SIM_SINTER_MAJOR = "#2" AND PROP.SIM_SINTER_MINOR > "#0") + + - + - Installed OR ( PROP.SIM_SINTER = "SimSinter" AND PROP.SIM_SINTER_MAJOR = "#1" AND PROP.SIM_SINTER_MINOR > "#3") + Installed OR ( PROP.SIM_SINTER = "SimSinter" AND PROP.SIM_SINTER_MAJOR = "#2" AND PROP.SIM_SINTER_MINOR > "#0") @@ -1189,25 +997,7 @@ - - - - - - - - - - - - - - - - - - - + @@ -1220,7 +1010,7 @@ - + diff --git a/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj b/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj index 41d3b78..7976189 100644 --- a/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj +++ b/Master/TurbineLiteWiXInstaller/TurbineLiteWiXInstaller.wixproj @@ -68,12 +68,6 @@ - - - - - - @@ -81,9 +75,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - test - - - - - \ No newline at end of file diff --git a/Master/TurbineLiteWiXInstaller/aspen73/AspenSinter73ConsumerWindowsService.exe.config b/Master/TurbineLiteWiXInstaller/aspen73/AspenSinter73ConsumerWindowsService.exe.config deleted file mode 100644 index 5664aab..0000000 --- a/Master/TurbineLiteWiXInstaller/aspen73/AspenSinter73ConsumerWindowsService.exe.config +++ /dev/null @@ -1,121 +0,0 @@ - - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - REPLACE - - - 5 - - - 5 - - - 5 - - - 5 - - - - - - \ No newline at end of file diff --git a/Master/TurbineLiteWiXInstaller/aspen73/ExcelSinterConsumerConsole.exe.config b/Master/TurbineLiteWiXInstaller/aspen73/ExcelSinterConsumerConsole.exe.config deleted file mode 100644 index b8da144..0000000 --- a/Master/TurbineLiteWiXInstaller/aspen73/ExcelSinterConsumerConsole.exe.config +++ /dev/null @@ -1,107 +0,0 @@ - - - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - test - - - - - \ No newline at end of file diff --git a/Master/TurbineLiteWiXInstaller/aspen73/ExcelSinterConsumerWindowsService.exe.config b/Master/TurbineLiteWiXInstaller/aspen73/ExcelSinterConsumerWindowsService.exe.config deleted file mode 100644 index 5703eae..0000000 --- a/Master/TurbineLiteWiXInstaller/aspen73/ExcelSinterConsumerWindowsService.exe.config +++ /dev/null @@ -1,105 +0,0 @@ - - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - REPLACE - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 44780c8..b7022cf 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,14 @@ This repository contains the code and Visual Studio solutions for building the f See installation and user guide documents in the [documentation](./docs) subdirectory. +## Supported Software +- AspenTech v8.4 to v10 +- MS Excel 2010 +`NOTE: higher versions may work but haven't been tested` + ## Authors -* Josh Boverhof +* Joshua Boverhof - LBNL See also the list of [contributors](../../contributors) who participated in this project. diff --git a/README.txt b/README.txt deleted file mode 100644 index 1167d5b..0000000 --- a/README.txt +++ /dev/null @@ -1,52 +0,0 @@ -##################################### -##################################### -## Turbine -## -##################################### - -##################################### -# Top-Level Projects -##################################### -1) Turbine.Common - DIJ Unity - -2) Turbine.Data - ADO.NET/EF4 Entites for data access - -3) Turbine.Data.Contract - Data Contracts for Consumers and Producers, provides - layer of abstraction to Turbine.Data. Encasulates the - business logic. - -##################################### -# Producers Projects -##################################### -1) Turbine.Web - Producer code for publishing to IIS - -##################################### -# Consumers Projects -##################################### - -##################################### -# TestSuites -##################################### -1) DataIntegrationTests - -2) RESTIntegrationTests - -3) UnitTests - -##################################### -# Utility -##################################### -1) ConsumerConsole - VisualBasic Example demonstrating a Consumer Process - -1) ServerConsoleApplication - Testing out a WCF service in a console. - -2) UserApplication - Console application for adding user or changing password. - -