diff options
| author | Eugeniy Mikhailov <evgmik@gmail.com> | 2012-09-20 11:28:16 -0400 |
|---|---|---|
| committer | Eugeniy Mikhailov <evgmik@gmail.com> | 2012-09-20 11:28:16 -0400 |
| commit | e87b5afe98e323ab76d3b683666de8cde4d84e60 (patch) | |
| tree | 7a1af7917643af9e098eca73be2393a6899f0d7f /xmds2/realistic_Rb | |
| parent | 5aff5a7ac556cee386a4f7028c638d07e4911d8b (diff) | |
| download | Nresonances-e87b5afe98e323ab76d3b683666de8cde4d84e60.tar.gz Nresonances-e87b5afe98e323ab76d3b683666de8cde4d84e60.zip | |
reflect new xmds file name in Makefiles
Diffstat (limited to 'xmds2/realistic_Rb')
| -rw-r--r-- | xmds2/realistic_Rb/Makefile.par | 15 | ||||
| -rw-r--r-- | xmds2/realistic_Rb/Makefile.pp | 29 |
2 files changed, 19 insertions, 25 deletions
diff --git a/xmds2/realistic_Rb/Makefile.par b/xmds2/realistic_Rb/Makefile.par index cc21c7b..5fddce1 100644 --- a/xmds2/realistic_Rb/Makefile.par +++ b/xmds2/realistic_Rb/Makefile.par @@ -7,15 +7,24 @@ ### This makefile can be used to build and run the XMDS examples +XMDS_FILES = $(wildcard *.xmds) +BASE_NAME = $(patsubst %.xmds,%,$(XMDS_FILES)) +RUN_FILES = $(patsubst %.xmds,%.run,$(XMDS_FILES)) +XSIL_FILES = $(patsubst %.xmds,%.xsil,$(XMDS_FILES)) PARAMS_FILES = $(wildcard *.params) PP_DIR = $(PARAMS_FILES:%.params=%) -CALC_XSIL_FILES = $(PARAMS_FILES:%.params=%/data.xsil) +CALC_XSIL_FILES = $(PARAMS_FILES:%.params=%/$(BASE_NAME).xsil) default: $(CALC_XSIL_FILES) -$(CALC_XSIL_FILES): %/data.xsil : % %.params +$(CALC_XSIL_FILES): %/$(BASE_NAME).xsil : % %.params echo processing $$(dirname $(@)) dir - $(MAKE) -C $$(dirname $(@)) -f ../Makefile.pp SCRIPTS_DIR=../ PARAMS_FILE=../$<.params + $(MAKE) -C $$(dirname $(@)) \ + -f ../Makefile.pp \ + SCRIPTS_DIR=../ \ + PARAMS_FILE=../$<.params \ + XSIL_FILES=$(XSIL_FILES) \ + RUN_FILES=$(RUN_FILES) $(PP_DIR): % : %.params echo need to make dir diff --git a/xmds2/realistic_Rb/Makefile.pp b/xmds2/realistic_Rb/Makefile.pp index 83e5bec..e24107e 100644 --- a/xmds2/realistic_Rb/Makefile.pp +++ b/xmds2/realistic_Rb/Makefile.pp @@ -2,35 +2,20 @@ ### 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) +XSIL_FILES = $(wildcard *.xsil) +RUN_FILES = $(patsubst %.xsil,%.run,$(XSIL_FILES)) +M_FILES = $(patsubst %.xsil,%.m,$(XSIL_FILES)) -SCRIPTS_DIR = . +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) +all: $(XSIL_FILES) $(M_FILES) plot fig -# 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) +$(XSIL_FILES): ../$(RUN_FILES) $(PARAMS_FILE) $< $(PARAMS) | grep "Time elapsed for simulation is:" > exact_analysis_execution_time.txt %.m: %.xsil @@ -50,11 +35,11 @@ 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 + rm -f $(M_FILES) $(XSIL_FILES) *.dat octave-core $(MAKE) -f $(SCRIPTS_DIR)/Makefile.fig $@ rm -f exact_analysis_execution_time.txt |