Skip to content
This repository has been archived by the owner on May 16, 2018. It is now read-only.

Commit

Permalink
Fork from iTesla/ipst
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathieu Bague committed Jan 17, 2017
1 parent 099e765 commit df82f8f
Show file tree
Hide file tree
Showing 12 changed files with 158 additions and 682 deletions.
59 changes: 5 additions & 54 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Build Status](https://travis-ci.org/itesla/ipst.svg?branch=master)](https://travis-ci.org/itesla/ipst)
[![Coverage Status](https://coveralls.io/repos/github/itesla/ipst/badge.svg?branch=master)](https://coveralls.io/github/itesla/ipst?branch=master)
[![Build Status](https://travis-ci.org/itesla/ipst-entsoe.svg?branch=master)](https://travis-ci.org/itesla/ipst-entsoe)
[![Coverage Status](https://coveralls.io/repos/github/itesla/ipst-entsoe/badge.svg?branch=master)](https://coveralls.io/github/itesla/ipst-entsoe?branch=master)
[![MPL-2.0 License](https://img.shields.io/badge/license-MPL_2.0-blue.svg)](https://www.mozilla.org/en-US/MPL/2.0/)

# iTESLA
Expand All @@ -11,41 +11,27 @@ http://www.itesla-pst.org
In order to build iPST you need:
* JDK *(1.8 or greater)*
* Maven
* CMake *(2.6 or greater)*
* Recent C++ compiler (GNU g++ or Clang)
* [ipst-core](https://github.com/itesla/ipst-core)

Optional C++ modules requires:
* Intel Fortran Compiler
* Matlab
* Dymola
* Eurostag

### Intel Fortran Compiler
To compile Eurostag dependant modules, you have to set your INTEL_HOME environment variable to the root of the
Intel Fortran Compiler installation.

## Install
To easily compile iPST, you can use the toolchain:
```
$> git clone https://github.com/itesla/ipst.git
$> git clone https://github.com/itesla/ipst-entsoe.git
$> ./install.sh
```
By default, the toolchain will:
* download and compile all external packages from the Internet
* compile C++ and Java modules
* compile Java modules
* install iPST

### Targets

| Target | Description |
| ------ | ----------- |
| clean | Clean iPST modules |
| clean-thirdparty | Clean the thirdparty libraries |
| compile | Compile iPST modules |
| package | Compile iPST modules and create a distributable package |
| __install__ | __Compile iPST modules and install it__ |
| docs | Generate the documentation (Doxygen/Javadoc) |
| docs | Generate the documentation (Javadoc) |
| help | Display this help |

### Options
Expand All @@ -61,45 +47,10 @@ each time you use the toolchain.
| --prefix | Set the installation directory | $HOME/itesla |
| --package-type | Set the package format. The supported formats are zip, tar, tar.gz and tar.bz2 | zip |

#### C++ modules

| Option | Description | Default value |
| ------ | ----------- | ------------- |
| --with-dymola | Enable the compilation of Dymola dependant modules | $DYMOLA_HOME |
| --without-dymola | Disable the compilation of Dymola dependant modules | |
| --with-eurostag | Enable the compilation of Eurostag dependant modules | $EUROSTAG_SDK_HOME |
| --without-eurostag | Disable the compilation of Eurostag dependant modules | |
| --with-matlab | Enable the compilation of Matlab dependant modules | $MATLAB_HOME |
| --without-matlab | Disable the compilation of Matlab dependant modules | |

#### Third-parties

| Option | Description | Default value |
| ------ | ----------- | ------------- |
| --with-thirdparty | Enable the compilation of thirdparty libraries | |
| --without-thirdparty | Disable the compilation of thirdparty libraries | |
| --thirdparty-prefix | Set the thirdparty installation directory | $HOME/itesla_thirdparty |
| --thirdparty-download | Sets false to compile thirdparty libraries from a local repository | true |
| --thirdparty-packs | Sets the thirdparty libraries local repository | $HOME/itesla_packs |

### Default configuration file
```
ipst_prefix=$HOME/itesla
ipst_package_type=zip
# -- iPST C++ modules options --
eurostag_build=false
eurostag_home=$EUROSTAG_SDK_HOME
dymola_build=false
dymola_home=$DYMOLA_HOME
matlab_build=false
matlab_home=$MATLAB_HOME
# -- iPST thirdparty libraries --
thirdparty_build=true
thirdparty_prefix=$HOME/itesla_thirdparty
thirdparty_download=true
thirdparty_packs=$HOME/itesla_packs
```

## License
Expand Down
22 changes: 14 additions & 8 deletions cim1-import/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<parent>
<groupId>eu.itesla_project</groupId>
<artifactId>itesla-parent</artifactId>
<artifactId>ipst-entsoe</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>

Expand All @@ -28,10 +28,6 @@
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
</dependency>
<dependency>
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.gdata</artifactId>
Expand All @@ -46,13 +42,12 @@
</dependency>
<dependency>
<groupId>eu.itesla_project</groupId>
<artifactId>iidm-converter-api</artifactId>
<artifactId>commons</artifactId>
</dependency>
<dependency>
<groupId>eu.itesla_project</groupId>
<artifactId>iidm-network-api</artifactId>
<artifactId>iidm-converter-api</artifactId>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cim1-model</artifactId>
Expand All @@ -65,6 +60,11 @@
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand All @@ -75,5 +75,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>

</dependencies>
</project>
4 changes: 3 additions & 1 deletion cim1-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<parent>
<groupId>eu.itesla_project</groupId>
<artifactId>itesla-parent</artifactId>
<artifactId>ipst-entsoe</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>

Expand All @@ -24,6 +24,7 @@
<description>CIM ENTSO-E V1 model generated by CIM Gateway tool</description>

<dependencies>
<!-- Compilation dependencies -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.gdata</artifactId>
Expand All @@ -39,5 +40,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

</dependencies>
</project>
111 changes: 9 additions & 102 deletions distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<parent>
<groupId>eu.itesla_project</groupId>
<artifactId>itesla-parent</artifactId>
<artifactId>ipst-entsoe</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>

Expand All @@ -27,130 +27,37 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>offline-mpi</artifactId>
<artifactId>cim1-model</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>eu.itesla_project</groupId>
<artifactId>online-mpi</artifactId>
<version>${project.version}</version>
</dependency>

<!-- importers -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cim1-import</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ucte-import</artifactId>
<version>${project.version}</version>
</dependency>

<!-- case-repositories -->
<dependency>
<groupId>eu.itesla_project</groupId>
<artifactId>entsoe-case-repository</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Dynamic database (mysql) -->
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<artifactId>iidm-ddb-eurostag-import-export</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<!-- Data mining -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>histodb-client</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Sampler (WP4.1) -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sampling-integration</artifactId>
<artifactId>entsoe-util</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Eurostag simulator (WP4.3) -->
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>eurostag-integration</artifactId>
<artifactId>network-merge</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>eurostag-step-up-transformer</artifactId>
<version>${project.version}</version>
</dependency>

<!-- load flow based simulator -->
<dependency>
<groupId>eu.itesla_project</groupId>
<artifactId>pclfsim-integration</artifactId>
<version>${project.version}</version>
</dependency>

<!-- offline DB -->
<dependency>
<groupId>eu.itesla_project</groupId>
<artifactId>mmap-offline-db</artifactId>
<version>${project.version}</version>
</dependency>

<!-- rules DB -->
<dependency>
<groupId>eu.itesla_project</groupId>
<artifactId>file-system-rules-db</artifactId>
<version>${project.version}</version>
</dependency>

<!-- WCA -->
<dependency>
<groupId>eu.itesla_project</groupId>
<artifactId>wca-integration</artifactId>
<version>${project.version}</version>
</dependency>

<!-- XML contingencies -->
<dependency>
<groupId>eu.itesla_project</groupId>
<artifactId>iidm-actions-contingencies-xml-client</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.19</version>
</dependency>

<!-- Modelica exporter -->
<dependency>
<groupId>eu.itesla_project.iidm-ddb</groupId>
<artifactId>iidm-ddb-eurostag-modelica-converter</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>modelica-export</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>modelica-events-adder</artifactId>
<artifactId>ucte-import</artifactId>
<version>${project.version}</version>
</dependency>

<!-- fpf integration -->
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>fpf-integration</artifactId>
<artifactId>ucte-network</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
52 changes: 1 addition & 51 deletions distribution/src/main/resources/assemblies/full.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,65 +21,15 @@
<outputDirectory>share/java</outputDirectory>
</dependencySet>
</dependencySets>
<!-- include scripts, log configurations and binaries, if available -->
<fileSets>
<fileSet>
<directory>${project.basedir}/../scripts</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>*</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>${project.basedir}/../config</directory>
<outputDirectory>etc</outputDirectory>
<includes>
<include>logback*.xml</include>
</includes>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>${project.basedir}/../build/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>*</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>${project.basedir}/../build/lib</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>*.so</include>
</includes>
</fileSet>

<!-- include further resources -->
<!-- copy actions.xsd from iidm-actions-contingencies-xml-client module to etc -->
<fileSet>
<directory>${project.basedir}/../iidm-actions-contingencies-xml-client/src/main/resources</directory>
<outputDirectory>etc</outputDirectory>
<includes>
<include>xsd/actions.xsd</include>
</includes>
<fileMode>0644</fileMode>
</fileSet>

<fileSets>
<!-- Javadoc -->
<fileSet>
<directory>${project.basedir}/../target/site/apidocs</directory>
<outputDirectory>doc/java/ipst</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>

<!-- Doxygen -->
<fileSet>
<directory>${project.basedir}/../build/html</directory>
<outputDirectory>doc/cpp/ipst</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>

</fileSets>
</assembly>

Loading

0 comments on commit df82f8f

Please sign in to comment.