From d2f3609e9ecec5ec8dc02a992a6ec98e28ca9c6d Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 27 Feb 2019 18:37:32 +0000
Subject: [PATCH] Merge branch 'master' into plugins
---
src/general.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/general.h b/src/general.h
index 50d5a84..6756149 100644
--- a/src/general.h
+++ b/src/general.h
@@ -195,11 +195,13 @@
ts_double znorm;
ts_double area; // firstly needed for sh.c
ts_double volume; // firstly needed for sh.c
+ ts_double energy;
};
typedef struct ts_triangle ts_triangle;
struct ts_triangle_list{
ts_uint n;
+ ts_double a0;
ts_triangle **tria;
};
typedef struct ts_triangle_list ts_triangle_list;
@@ -273,6 +275,8 @@
long int pswitch;
long int constvolswitch;
long int constareaswitch;
+ long int stretchswitch;
+ ts_double xkA0;
ts_double constvolprecision;
char *multiprocessing;
long int brezveze0;
--
Gitblit v1.9.3