Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f57b115e5b | |||
| 9062d677f7 | |||
| 5d87c18cf7 | |||
| 456297b747 | |||
| 7a260faf64 | |||
| 9d4ac8e723 |
39
Makefile
39
Makefile
@@ -1,29 +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
|
||||
TARGETS=cc_s0 cc_s1 cc_s2 cs_s3 cs_s4 cs_s5
|
||||
|
||||
all: regular d1 d2 d3 d4 d5 d6
|
||||
|
||||
regular:
|
||||
$(COMMAND) regular.export
|
||||
|
||||
d1:
|
||||
$(COMMAND) d1.export
|
||||
|
||||
d2:
|
||||
$(COMMAND) d2.export
|
||||
|
||||
d3:
|
||||
$(COMMAND) d3.export
|
||||
|
||||
d4:
|
||||
$(COMMAND) d4.export
|
||||
|
||||
d5:
|
||||
$(COMMAND) d5.export
|
||||
|
||||
d6:
|
||||
$(COMMAND) d6.export
|
||||
|
||||
clean:
|
||||
rm *~
|
||||
|
||||
|
||||
all:
|
||||
for T in $(TARGETS); do \
|
||||
$(GC) $$T ; \
|
||||
for D in $(DEFECTS) ; do \
|
||||
$(COMMAND) $$D ; \
|
||||
done ; \
|
||||
$(GM) ; \
|
||||
done ;
|
||||
20
d1.export
20
d1.export
@@ -38,14 +38,14 @@ A tpmax 120000
|
||||
F comm /home/denis/Documents/disser/model/v4_w_friction/d1.comm D 1
|
||||
F mmed /home/denis/Documents/disser/model/v4_w_friction/regular.med D 20
|
||||
F mess /home/denis/Documents/disser/model/v4_w_friction/linear-static.mess R 6
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d1/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/v4_w_friction/res/d1/linear-static.rmed R 80
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d1/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/results/p3/s3/d1/linear-static.rmed R 80
|
||||
R base /home/denis/Documents/disser/model/v4_w_friction/linear-static.base RC 0
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d1/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d1/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d1/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d1/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d1/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d1/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d1/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d1/defect2.resu R 29
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d1/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d1/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d1/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d1/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d1/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d1/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d1/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d1/defect2.resu R 29
|
||||
|
||||
20
d2.export
20
d2.export
@@ -38,14 +38,14 @@ A tpmax 120000
|
||||
F comm /home/denis/Documents/disser/model/v4_w_friction/d2.comm D 1
|
||||
F mmed /home/denis/Documents/disser/model/v4_w_friction/regular.med D 20
|
||||
F mess /home/denis/Documents/disser/model/v4_w_friction/linear-static.mess R 6
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d2/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/v4_w_friction/res/d2/linear-static.rmed R 80
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d2/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/results/p3/s3/d2/linear-static.rmed R 80
|
||||
R base /home/denis/Documents/disser/model/v4_w_friction/linear-static.base RC 0
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d2/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d2/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d2/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d2/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d2/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d2/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d2/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d2/defect2.resu R 29
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d2/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d2/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d2/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d2/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d2/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d2/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d2/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d2/defect2.resu R 29
|
||||
|
||||
20
d3.export
20
d3.export
@@ -38,14 +38,14 @@ A tpmax 120000
|
||||
F comm /home/denis/Documents/disser/model/v4_w_friction/d3.comm D 1
|
||||
F mmed /home/denis/Documents/disser/model/v4_w_friction/regular.med D 20
|
||||
F mess /home/denis/Documents/disser/model/v4_w_friction/linear-static.mess R 6
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d3/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/v4_w_friction/res/d3/linear-static.rmed R 80
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d3/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/results/p3/s3/d3/linear-static.rmed R 80
|
||||
R base /home/denis/Documents/disser/model/v4_w_friction/linear-static.base RC 0
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d3/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d3/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d3/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d3/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d3/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d3/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d3/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d3/defect2.resu R 29
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d3/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d3/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d3/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d3/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d3/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d3/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d3/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d3/defect2.resu R 29
|
||||
|
||||
20
d4.export
20
d4.export
@@ -38,14 +38,14 @@ A tpmax 120000
|
||||
F comm /home/denis/Documents/disser/model/v4_w_friction/d4.comm D 1
|
||||
F mmed /home/denis/Documents/disser/model/v4_w_friction/regular.med D 20
|
||||
F mess /home/denis/Documents/disser/model/v4_w_friction/linear-static.mess R 6
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d4/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/v4_w_friction/res/d4/linear-static.rmed R 80
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d4/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/results/p3/s3/d4/linear-static.rmed R 80
|
||||
R base /home/denis/Documents/disser/model/v4_w_friction/linear-static.base RC 0
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d4/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d4/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d4/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d4/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d4/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d4/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d4/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d4/defect2.resu R 29
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d4/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d4/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d4/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d4/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d4/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d4/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d4/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d4/defect2.resu R 29
|
||||
|
||||
24
d5.export
24
d5.export
@@ -38,16 +38,16 @@ A tpmax 120000
|
||||
F comm /home/denis/Documents/disser/model/v4_w_friction/d5.comm D 1
|
||||
F mmed /home/denis/Documents/disser/model/v4_w_friction/regular.med D 20
|
||||
F mess /home/denis/Documents/disser/model/v4_w_friction/linear-static.mess R 6
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/v4_w_friction/res/d5/linear-static.rmed R 80
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/results/p3/s3/d5/linear-static.rmed R 80
|
||||
R base /home/denis/Documents/disser/model/v4_w_friction/linear-static.base RC 0
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/defect2.resu R 29
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/defect3.resu R 30
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d5/defect4.resu R 31
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/defect2.resu R 29
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/defect3.resu R 30
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d5/defect4.resu R 31
|
||||
|
||||
24
d6.export
24
d6.export
@@ -38,16 +38,16 @@ A tpmax 120000
|
||||
F comm /home/denis/Documents/disser/model/v4_w_friction/d6.comm D 1
|
||||
F mmed /home/denis/Documents/disser/model/v4_w_friction/regular.med D 20
|
||||
F mess /home/denis/Documents/disser/model/v4_w_friction/linear-static.mess R 6
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/v4_w_friction/res/d6/linear-static.rmed R 80
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/results/p3/s3/d6/linear-static.rmed R 80
|
||||
R base /home/denis/Documents/disser/model/v4_w_friction/linear-static.base RC 0
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/defect2.resu R 29
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/defect3.resu R 30
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/d6/defect4.resu R 31
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/defect1.resu R 28
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/defect2.resu R 29
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/defect3.resu R 30
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/d6/defect4.resu R 31
|
||||
|
||||
@@ -1,4 +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': 750, 'NU': 0.17} # Carbon
|
||||
m_fibers = {'E': 2e5, 'NU': 0.25} # Steel
|
||||
|
||||
@@ -38,12 +38,12 @@ A tpmax 120000
|
||||
F comm /home/denis/Documents/disser/model/v4_w_friction/regular.comm D 1
|
||||
F mmed /home/denis/Documents/disser/model/v4_w_friction/regular.med D 20
|
||||
F mess /home/denis/Documents/disser/model/v4_w_friction/linear-static.mess R 6
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/regular/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/v4_w_friction/res/regular/linear-static.rmed R 80
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/regular/linear-static.resu R 8
|
||||
F rmed /home/denis/Documents/disser/model/results/p3/s3/regular/linear-static.rmed R 80
|
||||
R base /home/denis/Documents/disser/model/v4_w_friction/linear-static.base RC 0
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/regular/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/regular/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/regular/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/regular/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/regular/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/v4_w_friction/res/regular/EQUI_NOEU_SIGM.resu R 27
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/regular/SIGM_NOEU_DEPL_matrix.resu R 22
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/regular/EQUI_NOEU_SIGM_matrix.resu R 23
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/regular/SIGM_NOEU_DEPL_fibers.resu R 24
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/regular/EQUI_NOEU_SIGM_fibers.resu R 25
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/regular/SIGM_NOEU_DEPL.resu R 26
|
||||
F resu /home/denis/Documents/disser/model/results/p3/s3/regular/EQUI_NOEU_SIGM.resu R 27
|
||||
|
||||
Reference in New Issue
Block a user