Prechádzať zdrojové kódy

Materials was changed, Makefile was added

Denis V. Dedkov 11 rokov pred
rodič
commit
696828e3d6
4 zmenil súbory, kde vykonal 16 pridanie a 7 odobranie
  1. 1 0
      .gitignore
  2. 14 0
      Makefile
  3. 1 7
      materials.py
  4. BIN
      materials.pyc

+ 1 - 0
.gitignore

@@ -3,3 +3,4 @@ res/*
 *~
 *.backup
 *.mess
+*.pyc

+ 14 - 0
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 ;

+ 1 - 7
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
+m_fibers = {'E': 28e4, 'NU': 0.2} # Carbon

BIN
materials.pyc