Merge branch 'feature_param_files'

5 files changed, 151 insertions, 0 deletions

diff --git a/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.fig b/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.fig
new file mode 100644
index 0000000..71fba31
--- /dev/null
+++ b/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.fig
@@ -0,0 +1,39 @@
+###  -*- make -*-
+### This makefile can be used to build and run the XMDS examples
+
+GNUPLOT_FILES = $(wildcard *.gp)
+
+SCRIPTS_DIR = .
+
+
+eps_targets  = $(wildcard *.eps)
+eps_bb_targets  =  $(eps_targets:%.eps=%.bb)
+pdf_targets  = $(eps_targets:%.eps=%.pdf)	
+png_targets  = $(pdf_targets:%.pdf=%.png)
+
+fig: png
+
+pdf: $(pdf_targets) 
+
+# fix bounding box
+$(eps_bb_targets): %.bb : %.eps
+	@cat $< | ps2eps -q -B > $@
+
+$(pdf_targets): %.pdf : %.bb
+	epspdf $< $@
+
+png: $(png_targets) 
+
+$(png_targets): %.png : %.pdf
+	convert -density 300 $< $@
+
+clean:
+	rm -f *.pdf
+	rm -f *.eps
+	rm -f *.bb
+
+real_clean: clean
+	rm -f *.png
+
+.PRECIOUS: %.run %.xsil %.m
+.PHONY: all clean
diff --git a/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.par b/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.par
new file mode 100644
index 0000000..cc21c7b
--- /dev/null
+++ b/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.par
@@ -0,0 +1,32 @@
+###  -*- make -*-
+### This file is part of the Debian xmds package
+### Copyright (C) 2006 Rafael Laboissiere
+### This file is relased under the GNU General Public License
+### NO WARRANTIES!
+
+### This makefile can be used to build and run the XMDS examples
+
+
+PARAMS_FILES = $(wildcard *.params)
+PP_DIR = $(PARAMS_FILES:%.params=%)
+CALC_XSIL_FILES = $(PARAMS_FILES:%.params=%/data.xsil)
+
+default: $(CALC_XSIL_FILES) 
+
+$(CALC_XSIL_FILES): %/data.xsil : % %.params  
+	echo processing $$(dirname $(@)) dir
+	$(MAKE) -C $$(dirname $(@)) -f ../Makefile.pp SCRIPTS_DIR=../ PARAMS_FILE=../$<.params  
+
+$(PP_DIR): % : %.params
+	echo need to make dir
+	[ -d $@ ] ||  mkdir -p  $@
+
+clean:
+	for d in $(PP_DIR); \
+	do $(MAKE) -C $$d SCRIPTS_DIR=../ -f ../Makefile.pp $@; done
+
+real_clean:
+	for d in $(PP_DIR); \
+	do $(MAKE) -C $$d SCRIPTS_DIR=../ -f ../Makefile.pp $@; done
+
+.PHONY: all clean
diff --git a/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.pp b/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.pp
new file mode 100644
index 0000000..83e5bec
--- /dev/null
+++ b/xmds2/Nlevels_with_doppler_with_z_4wm/Makefile.pp
@@ -0,0 +1,62 @@
+###  -*- make -*-
+### This makefile can be used to build and run the XMDS examples
+
+
+XSIL_FILES = Nlevels_with_doppler_with_z_4wm.xsil
+M_FILES = $(patsubst %.xsil,%.m,$(XSIL_FILES))
+GNUPLOT_FILES = $(wildcard *.gp)
+
+SCRIPTS_DIR = .
+
+XSIL2GRAPHICS = xsil2graphics
+
+# fast light
+#PARAMS =  --delta1=0 --delta2=0 --delta3=0 --E1o=1.9e7 --E2o=3.1e5 --E3o=3.8e7 --E4o=1e1
+#PARAMS =  --delta1=0 --delta2=0 --delta3=0 --E1o=0.1e7 --E2o=1e4 --E3o=.3e7 --E4o=0 --Lcell=1.5e-2 --Temperature=.0001
+PARAMS =  \
+	  --Ndens=1e15 \
+	  --Lcell=10.0e-2 \
+	  --Temperature=5 \
+	  --Pwidth=0.4e-6 \
+	  --delta1=0 --delta2=0 --delta3=0 \
+	  --E1o=2e7 --E2o=1e2 --E3o=4e7 --E4o=1e0
+
+
+include $(PARAMS_FILE)
+
+
+# slow light EIT
+#PARAMS =  --delta1=0 --delta2=0 --delta3=0 --E1o=1.9e7 --E2o=3.1e5 --E3o=0 --E4o=0
+
+all: $(XSIL_FILES) Nlevels_with_doppler_with_z_4wm.xsil $(M_FILES) plot fig
+
+Nlevels_with_doppler_with_z_4wm.xsil: ../Nlevels_with_doppler_with_z_4wm.run $(PARAMS_FILE)
+	$< $(PARAMS) | grep "Time elapsed for simulation is:" > exact_analysis_execution_time.txt
+
+%.m: %.xsil
+	$(XSIL2GRAPHICS) $<
+
+fig: pp_I2.stamp
+	$(MAKE) -f $(SCRIPTS_DIR)/Makefile.fig $@
+
+
+pretty_plots: pp_I2.stamp $(GNUPLOT_FILES)
+	gnuplot $(SCRIPTS_DIR)/plot_fields_propagation_I2.gp
+	gnuplot $(SCRIPTS_DIR)/plot_fields_propagation_I4.gp
+
+plot: pp_I2.stamp
+
+pp_I2.stamp: $(XSIL_FILES) $(M_FILES)
+	octave -q $(SCRIPTS_DIR)/pp_I2.m
+
+clean:
+	rm -f $(M_FILES) $(XSIL_FILES) *.dat octave-core 
+	rm -f pp_I2.stamp
+	$(MAKE) -f $(SCRIPTS_DIR)/Makefile.fig $@
+
+real_clean: clean
+	$(MAKE) -f $(SCRIPTS_DIR)/Makefile.fig $@
+	rm -f exact_analysis_execution_time.txt
+
+.PRECIOUS: %.run %.xsil %.m
+.PHONY: all clean
diff --git a/xmds2/Nlevels_with_doppler_with_z_4wm/fast_light.params b/xmds2/Nlevels_with_doppler_with_z_4wm/fast_light.params
new file mode 100644
index 0000000..f66ce4e
--- /dev/null
+++ b/xmds2/Nlevels_with_doppler_with_z_4wm/fast_light.params
@@ -0,0 +1,9 @@
+
+PARAMS =  \
+	  --Ndens=1e15 \
+	  --Lcell=10.0e-2 \
+	  --Temperature=5 \
+	  --Pwidth=0.4e-6 \
+	  --delta1=0 --delta2=0 --delta3=0 \
+	  --E1o=2e7 --E2o=1e2 --E3o=4e7 --E4o=1e0
+
diff --git a/xmds2/Nlevels_with_doppler_with_z_4wm/slow_light.params b/xmds2/Nlevels_with_doppler_with_z_4wm/slow_light.params
new file mode 100644
index 0000000..9c0d9e1
--- /dev/null
+++ b/xmds2/Nlevels_with_doppler_with_z_4wm/slow_light.params
@@ -0,0 +1,9 @@
+
+PARAMS =  \
+	  --Ndens=1e15 \
+	  --Lcell=10.0e-2 \
+	  --Temperature=5 \
+	  --Pwidth=0.4e-6 \
+	  --delta1=0 --delta2=0 --delta3=0 \
+	  --E1o=2e7 --E2o=1e2 --E3o=2e7 --E4o=0
+