From 696828e3d670e99b170f6eaf11a620ba6804cec8 Mon Sep 17 00:00:00 2001
From: "Denis V. Dedkov" <denis.v.dedkov@gmail.com>
Date: Sun, 15 Jun 2014 17:53:04 +0600
Subject: [PATCH] Materials was changed, Makefile was added

---
 .gitignore    |   1 +
 Makefile      |  14 ++++++++++++++
 materials.py  |   8 +-------
 materials.pyc | Bin 317 -> 0 bytes
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 Makefile
 delete mode 100644 materials.pyc

diff --git a/.gitignore b/.gitignore
index 1fda724..a58ffd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ res/*
 *~
 *.backup
 *.mess
+*.pyc
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0229a50
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+COMMAND=. ~/salome/SALOME-MECA-2014.1-LGPL/salome_prerequisites.sh;~/salome/SALOME-MECA-2014.1-LGPL/tools/Code_aster_frontend_20141/bin/codeaster-run
+GC=git checkout
+GM=$(GC) master
+DEFECTS=regular.export d1.export d2.export d3.export d4.export d5.export d6.export d7.export
+TARGETS=cc_s0 cc_s1 cc_s2 cs_s3 cs_s4 cs_s5
+
+all:
+	for T in $(TARGETS); do \
+		$(GC) $$T ; \
+		for D in $(DEFECTS) ; do \
+			$(COMMAND) $$D ; \
+		done ; \
+		$(GM) ; \
+	done ;
\ No newline at end of file
diff --git a/materials.py b/materials.py
index 9f9abf6..2625b27 100644
--- a/materials.py
+++ b/materials.py
@@ -1,9 +1,3 @@
 m_empty = {'E': 1.0E-20, 'NU': 0.0}
 m_matrix = {'E': 29e2, 'NU': 0.4} # Carbon
-m_fibers = {'E': 28e4, 'NU': 0.2} # Carbon
-
-#m_matrix = {'E': 400, 'NU': 0.05} # Carbon
-#m_fibers = {'E': 2e5, 'NU': 0.25} # Steel
-
-#m_matrix = {'E': 750, 'NU': 0.17} # Carbon
-#m_fibers = {'E': 2e5, 'NU': 0.25} # Steel
\ No newline at end of file
+m_fibers = {'E': 28e4, 'NU': 0.2} # Carbon
\ No newline at end of file
diff --git a/materials.pyc b/materials.pyc
deleted file mode 100644
index c7fbc22a6c533d1fb1c85c91060aca6d51eb832c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 317
zcmcckiI>Z#r#Cp60ScIbv;z<qgNO_!h7<;d6h;QK6d;S4!7K_Q#sU#zg@`eN)v-au
z*dby-<s1yb8k|5w(v_Vi@hqHk+`5Dj$a75x5@1lm1f={zA^a7~9MWga1c96O5D{@f
zN2th2dp`}3vr5>3L~eX)Zb3<92?v;+n^;nmSpnswWhSK-6>9(`7!X9UEs(39k)NBY
zpOTuFS*-7ppIn-onpaY+pORUeTBM(wpOTuRUuF_to*$o9l$l(TnV+W*G&i*<Gcl)F
ZuK;3|4NzHWPO2Tq3&kuzLWEI-5dZ~`Nk9Mq