Changeset 3315 in Sophya for trunk/Cosmo/SimLSS

Timestamp:

Aug 24, 2007, 5:02:25 PM (18 years ago)

Author:

cmv

Message:

add code fct transfert de W.Hu + prog de comparaison avec pkspectrum.cc cmv 24/08/2007

Location:

trunk/Cosmo/SimLSS

Files:

• Makefile (modified) (18 diffs)
• cmvchkwhu.cc (added)
• hu_power.c (added)
• hu_power.h (added)
• hu_sigma8.c (added)
• hu_tf_fit.c (added)
• hu_tf_fit.h (added)

trunk/Cosmo/SimLSS/Makefile

@@ -37 +37 @@
 LIBR = $(LIB)libcmvsimbao.a
 
+PROGSTEST = \
+        $(EXE)cmvtluc $(EXE)cmvchkwhu $(EXE)hu_sigma8
+
+PROGSTESTOBJ = \
+        $(OBJ)hu_tf_fit.o $(OBJ)hu_power.o \
+        $(OBJ)cmvtluc.o $(OBJ)cmvchkwhu.o $(OBJ)hu_sigma8.o
+
 #----
 all: lib prog
@@ -44 +51 @@
 prog: $(PROGS)
 
+progtest: $(PROGSTEST)
+
 clean:
         rm -f *.o
-        rm -f $(PROGS) $(LIBR)
-        rm -f $(PROGSOBJ) $(LIBROBJ)
+        rm -f $(PROGS) $(PROGSOBJ)
+        rm -f $(LIBR) $(LIBROBJ)
         rm -rf $(OBJ)/CmvBAO_cxxrep/
+        rm -f $(PROGSTEST) $(PROGSTESTOBJ)
 
 ##############################################################################
@@ -72 +82 @@
 cmvtuniv: $(EXE)cmvtuniv
         echo $@ " done"
-$(EXE)cmvtuniv: $(OBJ)cmvtuniv.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtuniv: $(OBJ)cmvtuniv.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtuniv.o $(MYLIB) 
 $(OBJ)cmvtuniv.o: cmvtuniv.cc
@@ -80 +90 @@
 cmvtransf: $(EXE)cmvtransf
         echo $@ " done"
-$(EXE)cmvtransf: $(OBJ)cmvtransf.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtransf: $(OBJ)cmvtransf.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtransf.o $(MYLIB) 
 $(OBJ)cmvtransf.o: cmvtransf.cc
@@ -88 +98 @@
 cmvtgrowth: $(EXE)cmvtgrowth
         echo $@ " done"
-$(EXE)cmvtgrowth: $(OBJ)cmvtgrowth.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtgrowth: $(OBJ)cmvtgrowth.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtgrowth.o $(MYLIB) 
 $(OBJ)cmvtgrowth.o: cmvtgrowth.cc
@@ -96 +106 @@
 cmvtstpk: $(EXE)cmvtstpk
         echo $@ " done"
-$(EXE)cmvtstpk: $(OBJ)cmvtstpk.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtstpk: $(OBJ)cmvtstpk.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtstpk.o $(MYLIB) 
 $(OBJ)cmvtstpk.o: cmvtstpk.cc
@@ -104 +114 @@
 cmvtstsch: $(EXE)cmvtstsch
         echo $@ " done"
-$(EXE)cmvtstsch: $(OBJ)cmvtstsch.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtstsch: $(OBJ)cmvtstsch.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtstsch.o $(MYLIB) 
 $(OBJ)cmvtstsch.o: cmvtstsch.cc
@@ -112 +122 @@
 cmvtstblack: $(EXE)cmvtstblack
         echo $@ " done"
-$(EXE)cmvtstblack: $(OBJ)cmvtstblack.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtstblack: $(OBJ)cmvtstblack.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtstblack.o $(MYLIB) 
 $(OBJ)cmvtstblack.o: cmvtstblack.cc
@@ -120 +130 @@
 cmvtvarspec: $(EXE)cmvtvarspec
         echo $@ " done"
-$(EXE)cmvtvarspec: $(OBJ)cmvtvarspec.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtvarspec: $(OBJ)cmvtvarspec.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtvarspec.o $(MYLIB) 
 $(OBJ)cmvtvarspec.o: cmvtvarspec.cc
@@ -128 +138 @@
 cmvdefsurv: $(EXE)cmvdefsurv
         echo $@ " done"
-$(EXE)cmvdefsurv: $(OBJ)cmvdefsurv.o $(LIB)libcmvsimbao.a
+$(EXE)cmvdefsurv: $(OBJ)cmvdefsurv.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvdefsurv.o $(MYLIB) 
 $(OBJ)cmvdefsurv.o: cmvdefsurv.cc
@@ -136 +146 @@
 cmvobserv3d: $(EXE)cmvobserv3d
         echo $@ " done"
-$(EXE)cmvobserv3d: $(OBJ)cmvobserv3d.o $(LIB)libcmvsimbao.a
+$(EXE)cmvobserv3d: $(OBJ)cmvobserv3d.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvobserv3d.o $(MYLIB) 
 $(OBJ)cmvobserv3d.o: cmvobserv3d.cc
@@ -144 +154 @@
 cmvtintfun: $(EXE)cmvtintfun
         echo $@ " done"
-$(EXE)cmvtintfun: $(OBJ)cmvtintfun.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtintfun: $(OBJ)cmvtintfun.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtintfun.o $(MYLIB) 
 $(OBJ)cmvtintfun.o: cmvtintfun.cc
@@ -152 +162 @@
 cmvconcherr: $(EXE)cmvconcherr
         echo $@ " done"
-$(EXE)cmvconcherr: $(OBJ)cmvconcherr.o $(LIB)libcmvsimbao.a
+$(EXE)cmvconcherr: $(OBJ)cmvconcherr.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvconcherr.o $(MYLIB) 
 $(OBJ)cmvconcherr.o: cmvconcherr.cc
@@ -161 +171 @@
 cmvtpoisson: $(EXE)cmvtpoisson
         echo $@ " done"
-$(EXE)cmvtpoisson: $(OBJ)cmvtpoisson.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtpoisson: $(OBJ)cmvtpoisson.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtpoisson.o $(MYLIB) 
 $(OBJ)cmvtpoisson.o: cmvtpoisson.cc
@@ -169 +179 @@
 cmvtinterp: $(EXE)cmvtinterp
         echo $@ " done"
-$(EXE)cmvtinterp: $(OBJ)cmvtinterp.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtinterp: $(OBJ)cmvtinterp.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtinterp.o $(MYLIB) 
 $(OBJ)cmvtinterp.o: cmvtinterp.cc
@@ -177 +187 @@
 cmvtstagn: $(EXE)cmvtstagn
         echo $@ " done"
-$(EXE)cmvtstagn: $(OBJ)cmvtstagn.o $(LIB)libcmvsimbao.a
+$(EXE)cmvtstagn: $(OBJ)cmvtstagn.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvtstagn.o $(MYLIB) 
 $(OBJ)cmvtstagn.o: cmvtstagn.cc
@@ -185 +195 @@
 cmvschdist: $(EXE)cmvschdist
         echo $@ " done"
-$(EXE)cmvschdist: $(OBJ)cmvschdist.o $(LIB)libcmvsimbao.a
+$(EXE)cmvschdist: $(OBJ)cmvschdist.o $(LIBR)
         $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvschdist.o $(MYLIB) 
 $(OBJ)cmvschdist.o: cmvschdist.cc
@@ -191 +201 @@
 
 
+##############################################################################
+cmvchkwhu: $(EXE)cmvchkwhu
+        echo $@ " done"
+$(EXE)cmvchkwhu: $(OBJ)cmvchkwhu.o $(OBJ)hu_tf_fit.o $(OBJ)hu_power.o $(LIBR)
+        $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvchkwhu.o $(OBJ)hu_tf_fit.o $(OBJ)hu_power.o $(MYLIB) 
+$(OBJ)cmvchkwhu.o: cmvchkwhu.cc
+        $(CXXCOMPILE) $(CXXREP) -I$(MYEXTINC) -o $@ cmvchkwhu.cc
+$(OBJ)hu_tf_fit.o: hu_tf_fit.c hu_tf_fit.h
+        $(CCOMPILE) -o $@ hu_tf_fit.c
+$(OBJ)hu_power.o: hu_power.c hu_power.h
+        $(CCOMPILE) -o $@ hu_power.c
+
+hu_sigma8: $(EXE)hu_sigma8
+        echo $@ " done"
+$(EXE)hu_sigma8: $(OBJ)hu_sigma8.o $(OBJ)hu_power.o
+        $(CLINK) -o $@ $(OBJ)hu_sigma8.o $(OBJ)hu_power.o -lc -lm
+$(OBJ)hu_sigma8.o: hu_sigma8.c
+        $(CCOMPILE) -o $@ hu_sigma8.c
 
 ##############################################################################