Skip to content

H
hydraulicModel
Commit 795d3bed authored by 刘乐's avatar 刘乐
Browse files
Options

1，水力模型计算工程

parent c391c435
Hide whitespace changes
Inline Side-by-side
Showing with 726 additions and 22 deletions
.gitignore 0 → 100644
View file @ 795d3bed
EPNAET2/x64/
pandaAnalysis/x64/
pandaDbManager/x64/
.vs/
hydraulicModel.sln
View file @ 795d3bed
......@@ -9,38 +9,60 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pandaAnalysis", "pandaAnaly
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EPNAET2", "EPNAET2\EPNAET2.vcxproj", "{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pandaHydrCalc", "pandaHydrCalc\pandaHydrCalc.csproj", "{CBCA26F6-849E-4298-9AC0-07A01C21A543}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2B673FBC-3F91-4952-BDD3-4B802A761162}.Debug|Any CPU.ActiveCfg = Debug|Win32
{2B673FBC-3F91-4952-BDD3-4B802A761162}.Debug|x64.ActiveCfg = Debug|x64
{2B673FBC-3F91-4952-BDD3-4B802A761162}.Debug|x64.Build.0 = Debug|x64
{2B673FBC-3F91-4952-BDD3-4B802A761162}.Debug|x86.ActiveCfg = Debug|Win32
{2B673FBC-3F91-4952-BDD3-4B802A761162}.Debug|x86.Build.0 = Debug|Win32
{2B673FBC-3F91-4952-BDD3-4B802A761162}.Release|Any CPU.ActiveCfg = Release|Win32
{2B673FBC-3F91-4952-BDD3-4B802A761162}.Release|x64.ActiveCfg = Release|x64
{2B673FBC-3F91-4952-BDD3-4B802A761162}.Release|x64.Build.0 = Release|x64
{2B673FBC-3F91-4952-BDD3-4B802A761162}.Release|x86.ActiveCfg = Release|Win32
{2B673FBC-3F91-4952-BDD3-4B802A761162}.Release|x86.Build.0 = Release|Win32
{47F29C6C-9170-4188-A7AF-6BBCF38BFF6F}.Debug|Any CPU.ActiveCfg = Debug|Win32
{47F29C6C-9170-4188-A7AF-6BBCF38BFF6F}.Debug|x64.ActiveCfg = Debug|x64
{47F29C6C-9170-4188-A7AF-6BBCF38BFF6F}.Debug|x64.Build.0 = Debug|x64
{47F29C6C-9170-4188-A7AF-6BBCF38BFF6F}.Debug|x86.ActiveCfg = Debug|Win32
{47F29C6C-9170-4188-A7AF-6BBCF38BFF6F}.Debug|x86.Build.0 = Debug|Win32
{47F29C6C-9170-4188-A7AF-6BBCF38BFF6F}.Release|Any CPU.ActiveCfg = Release|Win32
{47F29C6C-9170-4188-A7AF-6BBCF38BFF6F}.Release|x64.ActiveCfg = Release|x64
{47F29C6C-9170-4188-A7AF-6BBCF38BFF6F}.Release|x64.Build.0 = Release|x64
{47F29C6C-9170-4188-A7AF-6BBCF38BFF6F}.Release|x86.ActiveCfg = Release|Win32
{47F29C6C-9170-4188-A7AF-6BBCF38BFF6F}.Release|x86.Build.0 = Release|Win32
{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}.Debug|Any CPU.ActiveCfg = Debug|Win32
{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}.Debug|x64.ActiveCfg = Debug|x64
{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}.Debug|x64.Build.0 = Debug|x64
{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}.Debug|x86.ActiveCfg = Debug|Win32
{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}.Debug|x86.Build.0 = Debug|Win32
{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}.Release|Any CPU.ActiveCfg = Release|Win32
{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}.Release|x64.ActiveCfg = Release|x64
{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}.Release|x64.Build.0 = Release|x64
{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}.Release|x86.ActiveCfg = Release|Win32
{BE73E098-3D8C-4F80-88DD-B36A2BB68B64}.Release|x86.Build.0 = Release|Win32
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Debug|x64.ActiveCfg = Debug|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Debug|x64.Build.0 = Debug|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Debug|x86.ActiveCfg = Debug|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Debug|x86.Build.0 = Debug|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Release|Any CPU.Build.0 = Release|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Release|x64.ActiveCfg = Release|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Release|x64.Build.0 = Release|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Release|x86.ActiveCfg = Release|Any CPU
{CBCA26F6-849E-4298-9AC0-07A01C21A543}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
pandaAnalysis/CivHydrCalc.cpp
View file @ 795d3bed
......@@ -17,10 +17,67 @@ CivHydrCalc::~CivHydrCalc()
delete mDbConn;
}
bool CivHydrCalc::simulation(char* fileName, char* rptFile, char* binOutFile, void (*pviewprog) (char*))
bool CivHydrCalc::simulation(char* fileName, char* rptFile, char* binOutFile)
{
int result = ENepanet(fileName, rptFile, binOutFile, pviewprog);
return false;
if (!exportInp(fileName))
return false;
// 等待
int index = 10000;
while (index-->0){}
short hydCode = 1;
long t(0), tstep(0);
int iTime(0);
int errcode = 0;
errcode = ENopen(fileName, rptFile, binOutFile);
if (errcode > 0)
{
ENclose();
return false;
}
if (ENopenH() > 0)
{
ENclose();
return false;
}
if (ENinitH(0) > 0)
{
ENclose();
return false;
}
// 计算
do
{
int nLinkCount;
ENgetcount(EN_LINKCOUNT, &nLinkCount);
for (int i = 1; i <= nLinkCount; i++)
{
int linkType;
char id[128] = "";
ENgetlinktype(i, &linkType);
ENgetlinkid(i, id);
}
if (ENrunH(&t) > 100) // errcode > 100 是错误
{
ENclose();
return false;
}
ENnextH(&tstep);
iTime++;
} while (tstep > 0);
// 获取计算结果
return true;
}
bool CivHydrCalc::exportInp(char* fileName)
......@@ -230,4 +287,106 @@ void CivHydrCalc::assemble(const std::string& table, CivInp& inp)
inp.writeComponet(tankItems, _TANKS);
}
}
void CivHydrCalc::getNodeResult(short time)
{
int nNodeCount;
ENgetcount(EN_NODECOUNT, &nNodeCount);
NodeResultItems nodeItems;
for (int i = 1; i <= nNodeCount; i++)
{
NodeResultItem nodeItem;
// 编号
ENgetnodeid(i, nodeItem.szNo);
// 流量
ENgetnodevalue(i, EN_DEMAND, &nodeItem.dFlow);
// 水头
ENgetnodevalue(i, EN_HEAD, &nodeItem.dHead);
// 压力
ENgetnodevalue(i, EN_PRESSURE, &nodeItem.dPressure);
// 标高
ENgetnodevalue(i, EN_ELEVATION, &nodeItem.dElevation);
// 实际需水量
ENgetnodevalue(i, EN_DEMAND, &nodeItem.dDemand);
// 水池容量
ENgetnodevalue(i, EN_TANKVOLUME, &nodeItem.dTankVolume);
// 水池最大容量
ENgetnodevalue(i, EN_MAXVOLUME, &nodeItem.dTankMaxVolume);
// 液位高度
ENgetnodevalue(i, EN_TANKLEVEL, &nodeItem.dTankLevel);
nodeItems.push_back(nodeItem);
}
mDbConn->updateNode(nodeItems);
}
void CivHydrCalc::getLinkResult(short time)
{
int nLinkCount;
ENgetcount(EN_LINKCOUNT, &nLinkCount);
LinkResultItems linkItems;
for (int i = 1; i <= nLinkCount; i++)
{
LinkResultItem linkItem;
// 编号
ENgetlinkid(i, linkItem.szNo);
// 流量
ENgetlinkvalue(i, EN_FLOW, &linkItem.dFlow);
// 流向
linkItem.nFlowDirect = (linkItem.dFlow >= 0) ? 0 : 1;
// 流速
ENgetlinkvalue(i, EN_VELOCITY, &linkItem.dVelocity);
// 水头损失
ENgetlinkvalue(i, EN_HEADLOSS, &linkItem.dHeadloss);
// 单位水头损失
float dPipeLen = 0.0f;;
ENgetlinkvalue(i, EN_LENGTH, &dPipeLen);
linkItem.dUnitHeadloss = (linkItem.dHeadloss / dPipeLen) * 1000;
// 获取上点和本点
int node1 = 0;
int node2 = 0;
ENgetlinknodes(i, &node1, &node2);
// 上点水头
ENgetnodevalue(node1, EN_HEAD, &linkItem.dFromNodHeadloss);
// 本点水头
ENgetnodevalue(node2, EN_HEAD, &linkItem.dToNodHeadloss);
// 局部水头损失
float fCoeff;
ENgetlinkvalue(i, EN_MINORLOSS, &fCoeff);
double dMinorloss = fCoeff * linkItem.dHeadloss;
linkItem.dLocalHeadloss = dMinorloss;// 局部水头损失
// 摩擦水头损失
linkItem.dFrictionHeadloss = linkItem.dHeadloss - linkItem.dLocalHeadloss;// 局部水头损失
// 状态
float fState = 0;
ENgetlinkvalue(i, EN_STATUS, &fState);
if ((int)fState == 0)
strcpy_s(linkItem.szStatus, "关闭");
else
strcpy_s(linkItem.szStatus, "开启");
linkItems.push_back(linkItem);
}
mDbConn->updateLink(linkItems);
}
bool DLLEXPORT dynamicCompute(std::string uri, std::string netName, std::string flag)
{
char* finalUri = const_cast<char*>(uri.c_str());
CivHydrCalc* calc = new CivHydrCalc(finalUri, netName);
char fileName[20];
char rptR[20];
char outBinFile[20];
const char* file = "test.inp";
strcpy_s(fileName, "test.inp");
strcpy_s(rptR, "test.rpt");
strcpy_s(outBinFile, "test.bin");
return calc->simulation(fileName, rptR, outBinFile);
}
\ No newline at end of file
pandaAnalysis/CivHydrCalc.h
View file @ 795d3bed
......@@ -2,11 +2,13 @@
#include<string>
#include "CivInp.h"
class CivDbConnection;
#define DLLEXPORT __declspec(dllexport)
class CivDbConnection;
/**
* 水力计算类
*/
class CivHydrCalc
class DLLEXPORT CivHydrCalc
{
public:
CivHydrCalc(char* uri, std::string netName);
......@@ -19,12 +21,14 @@ public:
*@binOutFile: 二进制输出文件
*@pviewprog: 回调函数
*/
bool simulation(char* inpFile, char* rptFile, char* binOutFile, void (*pviewprog) (char*));
bool simulation(char* inpFile, char* rptFile, char* binOutFile);
/**
*@brief 导出inp文件
*/
bool exportInp(char* fileName);
private:
/**
*@brief 解析表字段名，按顺序写入
......@@ -32,8 +36,30 @@ private:
*@inp: inp文件对象
*/
void assemble(const std::string& table, CivInp& inp);
/*
*@brief 获取节点计算结果
*@time： 时间
*/
void getNodeResult(short time);
/*
*@brief 获取管线计算结果
*@time： 时间
*/
void getLinkResult(short time);
private:
CivDbConnection* mDbConn;
std::string mNetname;
};
#if defined(__cplusplus)
extern "C" {
#endif
// 动态计算接口
bool DLLEXPORT dynamicCompute(std::string uri, std::string netName, std::string flag);
#if defined(__cplusplus)
}
#endif
pandaAnalysis/CivInp.h
View file @ 795d3bed
......@@ -116,7 +116,9 @@ public:
void setTimeStart(Str type, int step);
void setTimeOthers(Str type, Str val);
/**
*@brief 设置时间单位
*/
void setTimeUnit(TimeUnit timeUnit) { mTimeUnit = timeUnit; }
private:
Str getTimeUnit(TimeUnit timetype);
......
pandaAnalysis/main.cpp
View file @ 795d3bed
......@@ -8,11 +8,16 @@ int main(int argc, char* argv[])
const char* uri = "host=192.168.12.7 port=5432 dbname=liuletext user=postgres password=admin";
char* findUri = const_cast<char*>(uri);
CivHydrCalc* calc = new CivHydrCalc(findUri, std::string("ˮģ"));
char fileName[10];
char fileName[20];
char rptR[20];
char outBinFile[20];
const char* file = "test.inp";
strcpy(fileName, file);
calc->exportInp(fileName);
calc->simulation(fileName);
strcpy_s(fileName, "test.inp");
strcpy_s(rptR, "test.rpt");
strcpy_s(outBinFile, "test.bin");
//calc->exportInp(fileName);
calc->simulation(fileName, rptR, outBinFile);
return 0;
}
\ No newline at end of file
pandaAnalysis/pandaAnalysis.vcxproj
View file @ 795d3bed
......@@ -46,7 +46,7 @@
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
......@@ -134,6 +134,7 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)pandaDbManager;$(OUTDIR)..\include</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
......
pandaDbManager/CivDbConnection.cpp
View file @ 795d3bed
......@@ -24,7 +24,7 @@ bool CivDbConnection::open()
return true;
}
bool CivDbConnection::isValid()
bool CivDbConnection::isValid() const
{
return mIsOpen;
}
......@@ -37,12 +37,12 @@ void CivDbConnection::close()
}
Tables CivDbConnection::getTables(StrQuote netName)
Tables CivDbConnection::getTables(StrQuote netName,StrQuote schema) const
{
if (!isValid())
return Tables();
std::string sql = "select \"name\" from public.__layer_info__ where net_code in(select code from public.__layer_net_info__ where \"name\" ='" + netName + "' and \"schema\" = 'public')";
std::string sql = "select \"name\" from public.__layer_info__ where net_code in(select code from public.__layer_net_info__ where \"name\" ='" + netName + "' and \"schema\" = '"+ schema +"')";
std::string sqlStr = CivCommonUtils::string_To_UTF8(sql);
const char* finalSql = sqlStr.c_str();
PGresult* result = PQexec(mConn, finalSql);
......@@ -68,7 +68,18 @@ Tables CivDbConnection::getTables(StrQuote netName)
return tables;
}
Componets CivDbConnection::getComponets(StrQuote tableName)
bool CivDbConnection::updateNode(const NodeResultItems& nodeItems)
{
return true;
}
bool CivDbConnection::updateLink(const LinkResultItems& lineItems)
{
return true;
}
Componets CivDbConnection::getComponets(StrQuote tableName) const
{
if (!isValid())
return Nodes();
......@@ -106,7 +117,7 @@ Componets CivDbConnection::getComponets(StrQuote tableName)
return nodes;
}
bool CivDbConnection::createTable(StrQuote tableName)
bool CivDbConnection::createTable(StrQuote tableName, StrQuote schema)
{
return true;
}
\ No newline at end of file
pandaDbManager/CivDbConnection.h
View file @ 795d3bed
......@@ -20,25 +20,41 @@ public:
*@brief 获取管网的所有表
*@netName: 管网名
*/
Tables getTables(StrQuote netName);
Tables getTables(StrQuote netName, StrQuote schema = "public") const;
/**
*@brief 获取管网组件数据：管线，节点，水源等（必须组件） 水泵，阀门（可选组件）
*@tableName： 组件表
*/
Componets getComponets(StrQuote tableName);
Componets getComponets(StrQuote tableName) const;
/**
*@brief 创建表格
*/
bool createTable(StrQuote tableName);
bool createTable(StrQuote tableName,StrQuote schema);
/**
*@brief 更新点表数据
*@nodeItems：需要更新的值
*/
bool updateNode(const NodeResultItems& nodeItems);
/**
*@brief 更新线表的数据
*@lineItems: 线数据
*/
bool updateLink(const LinkResultItems& lineItems);
bool open();
void close();
bool isValid();
private:
bool isValid() const;
private:
PGconn* mConn;
bool mIsOpen = false;
char* mUri;
int mNode; // 节点个数
int mPipes; // 管线个数
};
\ No newline at end of file
pandaDbManager/CivTypes.h
View file @ 795d3bed
......@@ -42,8 +42,14 @@ struct Reactions {
// [REPORT]
// 描述模拟生成的输出报表内容。
// 描述模拟生成的输出报表内容
struct Report {
Str PAGESIZES;
Str NODES; // NONE/ALL/node1 node2 ...
Str LINKS; // NONE/ALL/link1 link2 ...
Str STATUS;
Str SUMMARY; //
Str ENERGY;
};
/*
......@@ -93,3 +99,36 @@ struct TanksFields {
Str X_Coord = "横坐标";
Str Y_Coord = "纵坐标";
};
// 水力计算管点结果缓存
struct NodeResultItem
{
char szNo[32]; // 本点号
float dFlow; // 流量
float dHead; // 水头
float dPressure; // 压力
float dElevation; // 标高
float dDemand; // 实际需水量
float dTankVolume; // 水池容量
float dTankMaxVolume; // 水池最大容量
float dTankLevel; // 液位高度
};
// 水力计算管线结果缓存
struct LinkResultItem
{
char szNo[32]; // 编号
float dFlow; // 流量
short nFlowDirect; // 流向
float dVelocity; // 流速
float dHeadloss; // 水头损失
float dUnitHeadloss; // 单位水头损失
float dFromNodHeadloss; // 上点水头
float dToNodHeadloss; // 本点水头
float dLocalHeadloss; // 局部水头损失
float dFrictionHeadloss; // 摩擦水头损失
char szStatus[20]; // 状态
};
#define NodeResultItems std::vector<NodeResultItem>
#define LinkResultItems std::vector<LinkResultItem>
\ No newline at end of file
pandaHydrCalc/CivHydrCalc.cs 0 → 100644
View file @ 795d3bed
using System;
using System.Runtime.InteropServices;
namespace pandaHydrCalc
{
public class CivHydrCalc
{
[DllImport("pandaAnalysis.dll.dll", EntryPoint = "dynamicCompute", ExactSpelling = false, CallingConvention = CallingConvention.Cdecl)]
private static extern int compute(String uri, String netName, String flag);
public int dycompute(String uri , String netName, String flag)
{
int intRtn = compute(uri, netName, flag);
return intRtn;
}
}
}
pandaHydrCalc/obj/Release/netstandard2.0/.NETStandard,Version=v2.0.AssemblyAttributes.cs 0 → 100644
View file @ 795d3bed
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.0", FrameworkDisplayName = "")]
pandaHydrCalc/obj/Release/netstandard2.0/pandaHydrCalc.AssemblyInfo.cs 0 → 100644
View file @ 795d3bed
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("pandaHydrCalc")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("pandaHydrCalc")]
[assembly: System.Reflection.AssemblyTitleAttribute("pandaHydrCalc")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// 由 MSBuild WriteCodeFragment 类生成。
pandaHydrCalc/obj/Release/netstandard2.0/pandaHydrCalc.csproj.FileListAbsolute.txt 0 → 100644
View file @ 795d3bed
E:\work\workspace\hydraulicModelCode\hModelProgram\Program\netstandard2.0\pandaHydrCalc.deps.json
E:\work\workspace\hydraulicModelCode\hModelProgram\Program\netstandard2.0\pandaHydrCalc.dll
E:\work\workspace\hydraulicModelCode\hModelProgram\Program\netstandard2.0\pandaHydrCalc.pdb
E:\work\workspace\hydraulicModelCode\hydraulicModel\pandaHydrCalc\obj\Release\netstandard2.0\pandaHydrCalc.csprojAssemblyReference.cache
E:\work\workspace\hydraulicModelCode\hydraulicModel\pandaHydrCalc\obj\Release\netstandard2.0\pandaHydrCalc.AssemblyInfoInputs.cache
E:\work\workspace\hydraulicModelCode\hydraulicModel\pandaHydrCalc\obj\Release\netstandard2.0\pandaHydrCalc.AssemblyInfo.cs
E:\work\workspace\hydraulicModelCode\hydraulicModel\pandaHydrCalc\obj\Release\netstandard2.0\pandaHydrCalc.csproj.CoreCompileInputs.cache
E:\work\workspace\hydraulicModelCode\hydraulicModel\pandaHydrCalc\obj\Release\netstandard2.0\pandaHydrCalc.dll
E:\work\workspace\hydraulicModelCode\hydraulicModel\pandaHydrCalc\obj\Release\netstandard2.0\pandaHydrCalc.pdb
E:\work\workspace\hydraulicModelCode\hModelProgram\netstandard2.0\pandaHydrCalc.deps.json
E:\work\workspace\hydraulicModelCode\hModelProgram\netstandard2.0\pandaHydrCalc.dll
E:\work\workspace\hydraulicModelCode\hModelProgram\netstandard2.0\pandaHydrCalc.pdb
pandaHydrCalc/obj/pandaHydrCalc.csproj.nuget.dgspec.json 0 → 100644
View file @ 795d3bed
{
"format": 1,
"restore": {
"E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\pandaHydrCalc\\pandaHydrCalc.csproj": {}
},
"projects": {
"E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\pandaHydrCalc\\pandaHydrCalc.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\pandaHydrCalc\\pandaHydrCalc.csproj",
"projectName": "pandaHydrCalc",
"projectPath": "E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\pandaHydrCalc\\pandaHydrCalc.csproj",
"packagesPath": "C:\\Users\\PC\\.nuget\\packages\\",
"outputPath": "E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\pandaHydrCalc\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\PC\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netstandard2.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netstandard2.0": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": {
"suppressParent": "All",
"target": "Package",
"version": "[2.0.3, )",
"autoReferenced": true
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.300\\RuntimeIdentifierGraph.json"
}
}
}
}
}
\ No newline at end of file
pandaHydrCalc/obj/pandaHydrCalc.csproj.nuget.g.props 0 → 100644
View file @ 795d3bed
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\PC\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
</PropertyGroup>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
</Project>
\ No newline at end of file
pandaHydrCalc/obj/pandaHydrCalc.csproj.nuget.g.targets 0 → 100644
View file @ 795d3bed
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('$(NuGetPackageRoot)netstandard.library\2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
</ImportGroup>
</Project>
\ No newline at end of file
pandaHydrCalc/obj/project.assets.json 0 → 100644
View file @ 795d3bed
{
"version": 3,
"targets": {
".NETStandard,Version=v2.0": {
"Microsoft.NETCore.Platforms/1.1.0": {
"type": "package",
"compile": {
"lib/netstandard1.0/_._": {}
},
"runtime": {
"lib/netstandard1.0/_._": {}
}
},
"NETStandard.Library/2.0.3": {
"type": "package",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
},
"compile": {
"lib/netstandard1.0/_._": {}
},
"runtime": {
"lib/netstandard1.0/_._": {}
},
"build": {
"build/netstandard2.0/NETStandard.Library.targets": {}
}
}
}
},
"libraries": {
"Microsoft.NETCore.Platforms/1.1.0": {
"sha512": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
"type": "package",
"path": "microsoft.netcore.platforms/1.1.0",
"files": [
".nupkg.metadata",
".signature.p7s",
"ThirdPartyNotices.txt",
"dotnet_library_license.txt",
"lib/netstandard1.0/_._",
"microsoft.netcore.platforms.1.1.0.nupkg.sha512",
"microsoft.netcore.platforms.nuspec",
"runtime.json"
]
},
"NETStandard.Library/2.0.3": {
"sha512": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"type": "package",
"path": "netstandard.library/2.0.3",
"files": [
".nupkg.metadata",
".signature.p7s",
"LICENSE.TXT",
"THIRD-PARTY-NOTICES.TXT",
"build/netstandard2.0/NETStandard.Library.targets",
"build/netstandard2.0/ref/Microsoft.Win32.Primitives.dll",
"build/netstandard2.0/ref/System.AppContext.dll",
"build/netstandard2.0/ref/System.Collections.Concurrent.dll",
"build/netstandard2.0/ref/System.Collections.NonGeneric.dll",
"build/netstandard2.0/ref/System.Collections.Specialized.dll",
"build/netstandard2.0/ref/System.Collections.dll",
"build/netstandard2.0/ref/System.ComponentModel.Composition.dll",
"build/netstandard2.0/ref/System.ComponentModel.EventBasedAsync.dll",
"build/netstandard2.0/ref/System.ComponentModel.Primitives.dll",
"build/netstandard2.0/ref/System.ComponentModel.TypeConverter.dll",
"build/netstandard2.0/ref/System.ComponentModel.dll",
"build/netstandard2.0/ref/System.Console.dll",
"build/netstandard2.0/ref/System.Core.dll",
"build/netstandard2.0/ref/System.Data.Common.dll",
"build/netstandard2.0/ref/System.Data.dll",
"build/netstandard2.0/ref/System.Diagnostics.Contracts.dll",
"build/netstandard2.0/ref/System.Diagnostics.Debug.dll",
"build/netstandard2.0/ref/System.Diagnostics.FileVersionInfo.dll",
"build/netstandard2.0/ref/System.Diagnostics.Process.dll",
"build/netstandard2.0/ref/System.Diagnostics.StackTrace.dll",
"build/netstandard2.0/ref/System.Diagnostics.TextWriterTraceListener.dll",
"build/netstandard2.0/ref/System.Diagnostics.Tools.dll",
"build/netstandard2.0/ref/System.Diagnostics.TraceSource.dll",
"build/netstandard2.0/ref/System.Diagnostics.Tracing.dll",
"build/netstandard2.0/ref/System.Drawing.Primitives.dll",
"build/netstandard2.0/ref/System.Drawing.dll",
"build/netstandard2.0/ref/System.Dynamic.Runtime.dll",
"build/netstandard2.0/ref/System.Globalization.Calendars.dll",
"build/netstandard2.0/ref/System.Globalization.Extensions.dll",
"build/netstandard2.0/ref/System.Globalization.dll",
"build/netstandard2.0/ref/System.IO.Compression.FileSystem.dll",
"build/netstandard2.0/ref/System.IO.Compression.ZipFile.dll",
"build/netstandard2.0/ref/System.IO.Compression.dll",
"build/netstandard2.0/ref/System.IO.FileSystem.DriveInfo.dll",
"build/netstandard2.0/ref/System.IO.FileSystem.Primitives.dll",
"build/netstandard2.0/ref/System.IO.FileSystem.Watcher.dll",
"build/netstandard2.0/ref/System.IO.FileSystem.dll",
"build/netstandard2.0/ref/System.IO.IsolatedStorage.dll",
"build/netstandard2.0/ref/System.IO.MemoryMappedFiles.dll",
"build/netstandard2.0/ref/System.IO.Pipes.dll",
"build/netstandard2.0/ref/System.IO.UnmanagedMemoryStream.dll",
"build/netstandard2.0/ref/System.IO.dll",
"build/netstandard2.0/ref/System.Linq.Expressions.dll",
"build/netstandard2.0/ref/System.Linq.Parallel.dll",
"build/netstandard2.0/ref/System.Linq.Queryable.dll",
"build/netstandard2.0/ref/System.Linq.dll",
"build/netstandard2.0/ref/System.Net.Http.dll",
"build/netstandard2.0/ref/System.Net.NameResolution.dll",
"build/netstandard2.0/ref/System.Net.NetworkInformation.dll",
"build/netstandard2.0/ref/System.Net.Ping.dll",
"build/netstandard2.0/ref/System.Net.Primitives.dll",
"build/netstandard2.0/ref/System.Net.Requests.dll",
"build/netstandard2.0/ref/System.Net.Security.dll",
"build/netstandard2.0/ref/System.Net.Sockets.dll",
"build/netstandard2.0/ref/System.Net.WebHeaderCollection.dll",
"build/netstandard2.0/ref/System.Net.WebSockets.Client.dll",
"build/netstandard2.0/ref/System.Net.WebSockets.dll",
"build/netstandard2.0/ref/System.Net.dll",
"build/netstandard2.0/ref/System.Numerics.dll",
"build/netstandard2.0/ref/System.ObjectModel.dll",
"build/netstandard2.0/ref/System.Reflection.Extensions.dll",
"build/netstandard2.0/ref/System.Reflection.Primitives.dll",
"build/netstandard2.0/ref/System.Reflection.dll",
"build/netstandard2.0/ref/System.Resources.Reader.dll",
"build/netstandard2.0/ref/System.Resources.ResourceManager.dll",
"build/netstandard2.0/ref/System.Resources.Writer.dll",
"build/netstandard2.0/ref/System.Runtime.CompilerServices.VisualC.dll",
"build/netstandard2.0/ref/System.Runtime.Extensions.dll",
"build/netstandard2.0/ref/System.Runtime.Handles.dll",
"build/netstandard2.0/ref/System.Runtime.InteropServices.RuntimeInformation.dll",
"build/netstandard2.0/ref/System.Runtime.InteropServices.dll",
"build/netstandard2.0/ref/System.Runtime.Numerics.dll",
"build/netstandard2.0/ref/System.Runtime.Serialization.Formatters.dll",
"build/netstandard2.0/ref/System.Runtime.Serialization.Json.dll",
"build/netstandard2.0/ref/System.Runtime.Serialization.Primitives.dll",
"build/netstandard2.0/ref/System.Runtime.Serialization.Xml.dll",
"build/netstandard2.0/ref/System.Runtime.Serialization.dll",
"build/netstandard2.0/ref/System.Runtime.dll",
"build/netstandard2.0/ref/System.Security.Claims.dll",
"build/netstandard2.0/ref/System.Security.Cryptography.Algorithms.dll",
"build/netstandard2.0/ref/System.Security.Cryptography.Csp.dll",
"build/netstandard2.0/ref/System.Security.Cryptography.Encoding.dll",
"build/netstandard2.0/ref/System.Security.Cryptography.Primitives.dll",
"build/netstandard2.0/ref/System.Security.Cryptography.X509Certificates.dll",
"build/netstandard2.0/ref/System.Security.Principal.dll",
"build/netstandard2.0/ref/System.Security.SecureString.dll",
"build/netstandard2.0/ref/System.ServiceModel.Web.dll",
"build/netstandard2.0/ref/System.Text.Encoding.Extensions.dll",
"build/netstandard2.0/ref/System.Text.Encoding.dll",
"build/netstandard2.0/ref/System.Text.RegularExpressions.dll",
"build/netstandard2.0/ref/System.Threading.Overlapped.dll",
"build/netstandard2.0/ref/System.Threading.Tasks.Parallel.dll",
"build/netstandard2.0/ref/System.Threading.Tasks.dll",
"build/netstandard2.0/ref/System.Threading.Thread.dll",
"build/netstandard2.0/ref/System.Threading.ThreadPool.dll",
"build/netstandard2.0/ref/System.Threading.Timer.dll",
"build/netstandard2.0/ref/System.Threading.dll",
"build/netstandard2.0/ref/System.Transactions.dll",
"build/netstandard2.0/ref/System.ValueTuple.dll",
"build/netstandard2.0/ref/System.Web.dll",
"build/netstandard2.0/ref/System.Windows.dll",
"build/netstandard2.0/ref/System.Xml.Linq.dll",
"build/netstandard2.0/ref/System.Xml.ReaderWriter.dll",
"build/netstandard2.0/ref/System.Xml.Serialization.dll",
"build/netstandard2.0/ref/System.Xml.XDocument.dll",
"build/netstandard2.0/ref/System.Xml.XPath.XDocument.dll",
"build/netstandard2.0/ref/System.Xml.XPath.dll",
"build/netstandard2.0/ref/System.Xml.XmlDocument.dll",
"build/netstandard2.0/ref/System.Xml.XmlSerializer.dll",
"build/netstandard2.0/ref/System.Xml.dll",
"build/netstandard2.0/ref/System.dll",
"build/netstandard2.0/ref/mscorlib.dll",
"build/netstandard2.0/ref/netstandard.dll",
"build/netstandard2.0/ref/netstandard.xml",
"lib/netstandard1.0/_._",
"netstandard.library.2.0.3.nupkg.sha512",
"netstandard.library.nuspec"
]
}
},
"projectFileDependencyGroups": {
".NETStandard,Version=v2.0": [
"NETStandard.Library >= 2.0.3"
]
},
"packageFolders": {
"C:\\Users\\PC\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\pandaHydrCalc\\pandaHydrCalc.csproj",
"projectName": "pandaHydrCalc",
"projectPath": "E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\pandaHydrCalc\\pandaHydrCalc.csproj",
"packagesPath": "C:\\Users\\PC\\.nuget\\packages\\",
"outputPath": "E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\pandaHydrCalc\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\PC\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netstandard2.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netstandard2.0": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": {
"suppressParent": "All",
"target": "Package",
"version": "[2.0.3, )",
"autoReferenced": true
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.300\\RuntimeIdentifierGraph.json"
}
}
}
}
\ No newline at end of file
pandaHydrCalc/obj/project.nuget.cache 0 → 100644
View file @ 795d3bed
{
"version": 2,
"dgSpecHash": "BTwF79iAPfSLjDmcgIB1jgengh4HjoTCUbe/A3q+r9ISpaofC1ns8MKjqIMBCWzoku9YMNew3w5kIcWbA9YCQQ==",
"success": true,
"projectFilePath": "E:\\work\\workspace\\hydraulicModelCode\\hydraulicModel\\pandaHydrCalc\\pandaHydrCalc.csproj",
"expectedPackageFiles": [
"C:\\Users\\PC\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512",
"C:\\Users\\PC\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512"
],
"logs": []
}
\ No newline at end of file
pandaHydrCalc/pandaHydrCalc.csproj 0 → 100644
View file @ 795d3bed
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\hModelProgram\Program\</OutputPath>
<WarningLevel>3</WarningLevel>
</PropertyGroup>
</Project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment