Skip to content

Commit

Permalink
Merge branch 'master' into api
Browse files Browse the repository at this point in the history
  • Loading branch information
srebughini authored Jan 30, 2021
2 parents 1467bfa + 35e1fd2 commit 015dd25
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: cpp
dist: bionic
dist: focal
matrix:
include:
- #dist: bionic
compiler: g++
os: linux
sudo: required
Expand Down
3 changes: 2 additions & 1 deletion GUI/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# **ASALI: Modeling and beyond**

The Asali version with **Graphical User Interface** is an open-source code developed for engineers, chemists and students working on the modeling of gas phase mixture. From one side, thanks to its user-friendly interface, Asali is very helpful for those approaching the modeling of gas phase mixture for the first time. On the other side, the deep interaction with [Cantera](https://cantera.org/) allows more expert users in performing detailed simulations without losing time in coding their own models.
## **1. Introduction**
Let's go straight to the point! Asali main features are:
Expand Down Expand Up @@ -61,7 +62,7 @@ Asali is based on different open-source codes:
* [Gtkmm](https://www.gtkmm.org/en/): gnome based graphical interface
* [Matplotlib](https://matplotlib.org/): a comprehensive library for creating static, animated, and interactive visualizations in Python

Asali has been tested on Ubuntu 16.04 LTS, Ubuntu 18.04 LTS, Windows 10, Windows 8 and Debian Wheezy. If your Operating System (OS) is not one of them, please send us an email: ste.rebu@outlook.it
Asali has been tested on Ubuntu 16.04 LTS, Ubuntu 18.04 LTS, Ubuntu 20.04 LTS, Windows 10, Windows 8 and Debian Wheezy. If your Operating System (OS) is not one of them, please send us an email: ste.rebu@outlook.it

### 2.1 Linux OS
##### 2.1.1 Pre-requisites installation
Expand Down
4 changes: 2 additions & 2 deletions GUI/Ubuntu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ SRC := $(wildcard $(SRC_DIR)/*.cpp)
OBJ := $(SRC:$(SRC_DIR)/%.cpp=$(OBJ_DIR)/%.o)

CPPFLAGS := $(shell pkg-config gtkmm-3.0 gtk+-3.0 --cflags)\
$(shell python3-config --cflags)\
$(shell python3-config --embed --cflags)\
-I$(CANTERA_PREFIX)include\
-I$(CANTERA_PREFIX)include/cantera/ext\
-Iinclude

CFLAGS := -fPIC -Os -s -std=c++11 -DASALI_ON_WINDOW=0
LDFLAGS:= -L$(CANTERA_PREFIX)lib
LDLIBS := $(shell pkg-config gtkmm-3.0 gtk+-3.0 --libs)\
$(shell python3-config --libs)\
$(shell python3-config --embed --libs)\
-lcantera\
-lcantera_fortran\
-lgfortran\
Expand Down

0 comments on commit 015dd25

Please sign in to comment.