Commits

Aron Ahmadia committed 68f1d30

figure 7.2 reproduced

  • Participants
  • Parent commits 12bd3f4

Comments (0)

Files changed (16)

-BUILD_DIR=./build
+CWD := $(shell pwd)
+BUILD_DIR=$(CWD)/build
 
 all: $(BUILD_DIR) table_1 figure_5.1 table_2 \
      figure_4 figure_5 figure_6 figure_7
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)
 
-figure_5.1: source/figure_5.1/makefig.py 
+figure_5.1: source/figure_5.1/makefig.py source/figure_5.1/README.txt
 	@mkdir -p $(BUILD_DIR)/$@
 	@cat source/figure_5.1/README.txt
 	@cp source/figure_5.1/README.txt $(BUILD_DIR)/$@
 	@echo "Building figure 5.1 from raw data"
-	python $^ $(BUILD_DIR)/$@
-	@echo "***\nmanually crop image vertically and save in .pdf format\n***"
+	(cd source/figure_5.1 && python makefig.py $(BUILD_DIR)/$@)
+	@echo "***\nMANUAL STEP: crop image vertically and save in .pdf format\n***"
 
 figure_5.1/experiment: source/figure_5.1/experiment/src2.f source/figure_5.1/experiment/shockbubble.py source/figure_5.1/experiment/Makefile
 	@mkdir -p $(BUILD_DIR)/$@	
 	@cp source/figure_5.1/experiment/README.txt $(BUILD_DIR)/$@
 	@cp $^ $(BUILD_DIR)/$@
 
+figure_7.2: source/figure_7.2/makefig.py source/figure_7.2/setplot.py source/figure_7.2/README.txt
+	@mkdir -p $(BUILD_DIR)/$@
+	@cat source/figure_7.2/README.txt
+	@cp source/figure_7.2/README.txt $(BUILD_DIR)/$@
+	@echo "Building figure 7.2 from pyclaw output"
+	(cd source/figure_7.2 && python makefig.py $(BUILD_DIR)/$@)
+
+figure_7.2/experiment: source/figure_7.2/experiment/shockbubble.py source/figure_7.2/experiment/Makefile 
+	@mkdir -p $(BUILD_DIR)/$@	
+	@cat source/figure_7.2/experiment/README.txt
+	@cp source/figure_7.2/experiment/README.txt $(BUILD_DIR)/$@
+	@echo "Re-running shock-bubble interaction"
+	(cd source/figure_7.2/experiment && time $(MAKE) data)
+	@cp $^ $(BUILD_DIR)/$@
+
 #catch all for unimplemented targets
 %: source/%/placeholder.txt 
 	@cat $^

File source/figure_7.1/_output/fort.q0000

     1.25664062e-03   -5.74517059e-06    4.28205901e-05    1.14490210e-08
     1.25616022e-03   -5.85890479e-06    3.03708957e-05    4.08954081e-09
     1.25584279e-03   -5.94498376e-06    1.81183011e-05    8.17390795e-10
-    1.25568547e-03   -6.00314243e-06    6.00314243e-06   -2.96055919e-24
+    1.25568547e-03   -6.00314243e-06    6.00314243e-06   -2.94558602e-24
     1.25568547e-03   -6.00314243e-06   -6.00314243e-06    7.22795538e-26
     1.25584279e-03   -5.94498376e-06   -1.81183011e-05   -8.17390795e-10
     1.25616022e-03   -5.85890479e-06   -3.03708957e-05   -4.08954081e-09
     1.25664062e-03   -5.74517059e-06   -4.28205901e-05    1.14490210e-08
     1.25616022e-03   -5.85890479e-06   -3.03708957e-05    4.08954081e-09
     1.25584279e-03   -5.94498376e-06   -1.81183011e-05    8.17390795e-10
-    1.25568547e-03   -6.00314243e-06   -6.00314243e-06   -3.00702135e-24
-    1.25568547e-03   -6.00314243e-06    6.00314243e-06    2.96055919e-24
+    1.25568547e-03   -6.00314243e-06   -6.00314243e-06   -2.94712866e-24
+    1.25568547e-03   -6.00314243e-06    6.00314243e-06    2.94558602e-24
     1.25584279e-03   -5.94498376e-06    1.81183011e-05   -8.17390795e-10
     1.25616022e-03   -5.85890479e-06    3.03708957e-05   -4.08954081e-09
     1.25664062e-03   -5.74517059e-06    4.28205901e-05   -1.14490210e-08

File source/figure_7.1/shallow_4_Rossby_Haurwitz_wave.py

     claw = pyclaw.Controller()
     claw.keep_copy = False
     claw.outstyle = 1
-    claw.nout = 10
-    claw.tfinal = 10
+    claw.nout = 48
+    claw.tfinal = 48
     claw.solution = pyclaw.Solution(state)
     claw.solver = solver
     claw.outdir = outdir

File source/figure_7.2/README.txt

+ABOUT THIS EXPERIMENT
+===============
+Figure 7.2 displays the results of a shock-bubble interaction computation, showing the transformation of an initially spherical bubble
+into a “smoke ring” after it is impacted by a shock wave.
+
+RESPONSIBLE AUTHORS
+==============
+Matteo Parsani
+David Ketcheson
+Aron Ahmadia

File source/figure_7.2/_output/claw.pkl0000

-(dp0
-S'ndim'
-p1
-I2
-sS'maux'
-p2
-I1
-sS'meqn'
-p3
-I5
-sS'aux_global'
-p4
-(dp5
-S'gamma1'
-p6
-F0.39999999999999991
-sS'gamma'
-p7
-F1.3999999999999999
-ssS'write_aux'
-p8
-I00
-sS't'
-p9
-F0.0
-sS'nstates'
-p10
-I1
-s.(dp0
-S'd'
-p1
-(lp2
-F0.0015625000000000001
-aF0.0015625000000000001
-asS'lower'
-p3
-(lp4
-F0.0
-aF0.0
-asS'n'
-p5
-(lp6
-I1280
-aI320
-asS'names'
-p7
-(lp8
-S'x'
-p9
-aS'y'
-p10
-asS'level'
-p11
-I1
-s.

File source/figure_7.2/_output/claw.pkl0009

-(dp0
-S'ndim'
-p1
-I2
-sS'maux'
-p2
-I1
-sS'meqn'
-p3
-I5
-sS'aux_global'
-p4
-(dp5
-S'gamma1'
-p6
-F0.39999999999999991
-sS'gamma'
-p7
-F1.3999999999999999
-ssS'write_aux'
-p8
-I00
-sS't'
-p9
-cnumpy.core.multiarray
-scalar
-p10
-(cnumpy
-dtype
-p11
-(S'f8'
-p12
-I0
-I1
-tp13
-Rp14
-(I3
-S'<'
-p15
-NNNI-1
-I-1
-I0
-tp16
-bS'\x99\x99\x99\x99\x99\x99\xe5?'
-p17
-tp18
-Rp19
-sS'nstates'
-p20
-I1
-s.(dp0
-S'd'
-p1
-(lp2
-F0.0015625000000000001
-aF0.0015625000000000001
-asS'lower'
-p3
-(lp4
-F0.0
-aF0.0
-asS'n'
-p5
-(lp6
-I1280
-aI320
-asS'names'
-p7
-(lp8
-S'x'
-p9
-aS'y'
-p10
-asS'level'
-p11
-I1
-s.