Skip to content

Commit

Permalink
Changed name of the project and executable from iREVEAL to iRevealLit
Browse files Browse the repository at this point in the history
  • Loading branch information
jinliangma committed Mar 6, 2018
1 parent a13472b commit 87ea33b
Show file tree
Hide file tree
Showing 32 changed files with 79 additions and 98 deletions.
4 changes: 2 additions & 2 deletions Java/DataModel/UnitOperation.java
Original file line number Diff line number Diff line change
Expand Up @@ -4050,13 +4050,13 @@ public static void main(String argu[])
if (argu[0].equals("-a"))
{
uo.exportACMRom();
uo.exportFileForSampling("iReveal.io");
uo.exportFileForSampling("iRevealLite.io");
return;
}
if (argu[0].equals("-c"))
{
uo.exportCapeOpenRom();
uo.exportFileForSampling("iReveal.io");
uo.exportFileForSampling("iRevealLite.io");
return;
}
//assume any other option is "-b" option
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
javac -cp gson-2.2.4.jar DataModel/*java
jar xf gson-2.2.4.jar
jar cmf MANIFEST.MF iReveal.jar com/* DataModel/*.class
jar cmf MANIFEST.MF iRevealLite.jar com/* DataModel/*.class
2 changes: 1 addition & 1 deletion Java/make_ireveal_jar.sh → Java/make_ireveallite_jar.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
javac -cp gson-2.2.4.jar DataModel/*java
jar xf gson-2.2.4.jar
jar cmf MANIFEST.MF iReveal.jar com/* DataModel/*.class
jar cmf MANIFEST.MF iRevealLite.jar com/* DataModel/*.class
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Copyright (c) 2012 - 2018

### Copyright Notice ###

iREVEAL was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2018 by the software owners: Oak Ridge Institute for Science and Education (ORISE), Los Alamos 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.
iRevealLite was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2018 by the software owners: Oak Ridge Institute for Science and Education (ORISE), Los Alamos 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 ###

iREVEAL (c) 2012 - 2018, by the software owners: Oak Ridge Institute for Science and Education (ORISE), Los Alamos 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.
iRevealLite (c) 2012 - 2018, by the software owners: Oak Ridge Institute for Science and Education (ORISE), Los Alamos 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:
Expand Down
18 changes: 5 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,30 @@
# iREVEAL
Automate tool to create reduced order model and export solution for CFD models
# iRevealLite
Automate tool to create reduced order model from high-fidelity model

## Getting Started
See installaton and user guide documents in the [documentation](docs) subdirectory.

This software has been compiled and tested on Windows 7 professional
This software has been compiled and tested on Windows 7 professional and Linux

### Pre-requisites
Your environment must have the following tools installed.
The build has be tested with the following versions. Use other
versions at your own risk.

+ Ant 1.9.6
+ Git Bash for windows
+ Java 1.8
+ 7z

### Build and Package
After installing the tools above run the Git Bash program.
Executing the commands below tocompile the source and
and package the output
See installation manual in the [documentation](docs) subdirectory.


```
git clone https://github.com/CCSI-Toolset/iREVEAL.git
cd iREVEAL
start make.bat
```

## Authors

* Poorva Sharma
* Khushbu Agarwal
* Jinliang Ma

See also the list of [contributors](../../contributors) who participated in this project.

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
11 changes: 0 additions & 11 deletions iReveal/iReveal.vcxproj.user

This file was deleted.

Binary file added iRevealLite.sdf
Binary file not shown.
10 changes: 5 additions & 5 deletions iReveal.sln → iRevealLite.sln
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iReveal", "iReveal\iReveal.vcxproj", "{4F3FAE00-163E-46D0-8DB8-F3D4BC142F0E}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iRevealLite", "iRevealLite.vcxproj", "{BB231152-0090-4081-A159-2A774254B027}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4F3FAE00-163E-46D0-8DB8-F3D4BC142F0E}.Debug|Win32.ActiveCfg = Debug|Win32
{4F3FAE00-163E-46D0-8DB8-F3D4BC142F0E}.Debug|Win32.Build.0 = Debug|Win32
{4F3FAE00-163E-46D0-8DB8-F3D4BC142F0E}.Release|Win32.ActiveCfg = Release|Win32
{4F3FAE00-163E-46D0-8DB8-F3D4BC142F0E}.Release|Win32.Build.0 = Release|Win32
{BB231152-0090-4081-A159-2A774254B027}.Debug|Win32.ActiveCfg = Debug|Win32
{BB231152-0090-4081-A159-2A774254B027}.Debug|Win32.Build.0 = Debug|Win32
{BB231152-0090-4081-A159-2A774254B027}.Release|Win32.ActiveCfg = Release|Win32
{BB231152-0090-4081-A159-2A774254B027}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
44 changes: 22 additions & 22 deletions iReveal/iReveal.vcxproj → iRevealLite.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,10 @@
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CCSI.h" />
<ClInclude Include="DesignSite.h" />
<ClInclude Include="Kriging.h" />
<ClInclude Include="LHS.h" />
<ClInclude Include="Matrix.h" />
<ClInclude Include="Simplex.h" />
<ClInclude Include="Util.h" />
<ClInclude Include="YROM.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="DesignSite.cpp" />
<ClCompile Include="Kriging.cpp" />
<ClCompile Include="LHS.cpp" />
<ClCompile Include="Main.cpp" />
<ClCompile Include="Matrix.cpp" />
<ClCompile Include="Simplex.cpp" />
<ClCompile Include="Util.cpp" />
<ClCompile Include="YROM.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4F3FAE00-163E-46D0-8DB8-F3D4BC142F0E}</ProjectGuid>
<ProjectGuid>{BB231152-0090-4081-A159-2A774254B027}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>iReveal</RootNamespace>
<RootNamespace>iRevealLite</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -97,6 +77,26 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="iRevealLite\CCSI.h" />
<ClInclude Include="iRevealLite\DesignSite.h" />
<ClInclude Include="iRevealLite\Kriging.h" />
<ClInclude Include="iRevealLite\LHS.h" />
<ClInclude Include="iRevealLite\Matrix.h" />
<ClInclude Include="iRevealLite\Simplex.h" />
<ClInclude Include="iRevealLite\Util.h" />
<ClInclude Include="iRevealLite\YROM.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="iRevealLite\DesignSite.cpp" />
<ClCompile Include="iRevealLite\Kriging.cpp" />
<ClCompile Include="iRevealLite\LHS.cpp" />
<ClCompile Include="iRevealLite\Main.cpp" />
<ClCompile Include="iRevealLite\Matrix.cpp" />
<ClCompile Include="iRevealLite\Simplex.cpp" />
<ClCompile Include="iRevealLite\Util.cpp" />
<ClCompile Include="iRevealLite\YROM.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
32 changes: 16 additions & 16 deletions iReveal/iReveal.vcxproj.filters → iRevealLite.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -15,54 +15,54 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="LHS.h">
<ClInclude Include="iRevealLite\CCSI.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CCSI.h">
<ClInclude Include="iRevealLite\DesignSite.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="DesignSite.h">
<ClInclude Include="iRevealLite\Kriging.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Kriging.h">
<ClInclude Include="iRevealLite\LHS.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Matrix.h">
<ClInclude Include="iRevealLite\Matrix.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Util.h">
<ClInclude Include="iRevealLite\Simplex.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Simplex.h">
<ClInclude Include="iRevealLite\Util.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="YROM.h">
<ClInclude Include="iRevealLite\YROM.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="DesignSite.cpp">
<ClCompile Include="iRevealLite\DesignSite.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Kriging.cpp">
<ClCompile Include="iRevealLite\Kriging.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Matrix.cpp">
<ClCompile Include="iRevealLite\LHS.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Simplex.cpp">
<ClCompile Include="iRevealLite\Main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Util.cpp">
<ClCompile Include="iRevealLite\Matrix.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="YROM.cpp">
<ClCompile Include="iRevealLite\Simplex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="LHS.cpp">
<ClCompile Include="iRevealLite\Util.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Main.cpp">
<ClCompile Include="iRevealLite\YROM.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions iReveal/Main.cpp → iRevealLite/Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ int main(int argc, char* argv[])
string str;
if (argc<2)
{
printf("iReveal command takes at least one argument\n");
printf("iRevealLite command takes at least one argument\n");
PrintCommandUsage();
return 1;
}
Expand All @@ -22,7 +22,7 @@ int main(int argc, char* argv[])
}
if (!strcmp(argv[1],"-v")) //sampling option
{
printf("iReveal version 2.0, 2018\n");
printf("iRevealLite version 2.0, 2018\n");
return 0;
}
if (!strcmp(argv[1],"-s")) //sampling option
Expand Down
4 changes: 2 additions & 2 deletions iReveal/Makefile → iRevealLite/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ OBJS=Main.o \
$(CXX) $(CFLAGS) -c $<

iReveal: $(OBJS)
$(CXX) $(CFLAGS) -o iReveal $(OBJS)
$(CXX) $(CFLAGS) -o iRevealLite $(OBJS)

$(OBJS): CCSI.h \
DesignSite.h \
Expand All @@ -28,4 +28,4 @@ $(OBJS): CCSI.h \
YROM.h

clean:
@rm -rf *.o iReveal
@rm -rf *.o iRevealLite
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 87ea33b

Please sign in to comment.