Changeset 3768 in Sophya for trunk/Cosmo/SimLSS/Makefile

Timestamp:

May 3, 2010, 4:08:34 PM (15 years ago)

Author:

cmv

Message:

• refonte du code pour creer uniquement des conditions initiales
• introduction du tirage des vitesse LOS pour les redshift-distortion

cmv 03/05/2010

File:

• trunk/Cosmo/SimLSS/Makefile (modified) (4 diffs)

trunk/Cosmo/SimLSS/Makefile

@@ -11 +11 @@
 
 MYEXTINC = ${EXTLIBDIR}/${MACH}/include
-MYLIB  = $(SOPHYAEXTSLBLIST) -L$(LIB) -lcmvsimbao -lcmvgenfluc -lfftw3_threads -lfftw3 -lm
-MYLIB4 = $(SOPHYAEXTSLBLIST) -L$(LIB) -lcmvsimbao -lcmvgenfluc4 -lfftw3f_threads -lfftw3f -lm
+MYLIB  = $(SOPHYAEXTSLBLIST) -L$(LIB) -lcmvgenfluc -lcmvsimbao -lfftw3_threads -lfftw3 -lm
+MYLIB4 = $(SOPHYAEXTSLBLIST) -L$(LIB) -lcmvgenfluc4 -lcmvsimbao -lfftw3f_threads -lfftw3f -lm
 
 #--------------------------------------------------------------------------
@@ -18 +18 @@
 PROGS = \
        $(EXE)cmvobserv3d $(EXE)cmvobserv3df \
+       $(EXE)cmvginit3d $(EXE)cmvginit3df \
        $(EXE)cmvtuniv $(EXE)cmvtransf $(EXE)cmvtgrowth $(EXE)cmvtstpk \
        $(EXE)cmvtstsch $(EXE)cmvtstblack $(EXE)cmvtvarspec $(EXE)cmvdefsurv \
@@ -25 +26 @@
 PROGSOBJ = \
           $(OBJ)cmvobserv3d.o $(OBJ)cmvobserv3df.o \
+          $(OBJ)cmvginit3d.o $(OBJ)cmvginit3df.o \
           $(OBJ)cmvtuniv.o $(OBJ)cmvtransf.o $(OBJ)cmvtgrowth.o $(OBJ)cmvtstpk.o \
           $(OBJ)cmvtstsch.o $(OBJ)cmvtstblack.o $(OBJ)cmvtvarspec.o $(OBJ)cmvdefsurv.o \
@@ -189 +191 @@
 
 ##############################################################################
+cmvginit3d: $(EXE)cmvginit3d
+        echo $@ " done"
+$(EXE)cmvginit3d: $(OBJ)cmvginit3d.o $(LIBR) $(LIBG)
+        $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvginit3d.o $(MYLIB) 
+$(OBJ)cmvginit3d.o: cmvginit3d.cc
+        $(CXXCOMPILE) $(CXXREP) -I$(MYEXTINC) -o $@ cmvginit3d.cc
+
+cmvginit3df: $(EXE)cmvginit3df
+        echo $@ " done"
+$(EXE)cmvginit3df: $(OBJ)cmvginit3df.o $(LIBR) $(LIBG4)
+        $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvginit3df.o $(MYLIB4) 
+$(OBJ)cmvginit3df.o: cmvginit3d.cc
+        $(CXXCOMPILE) $(CXXREP) -I$(MYEXTINC) -DGEN3D_FLOAT -o $@ cmvginit3d.cc
+
+##############################################################################
 cmvtintfun: $(EXE)cmvtintfun
         echo $@ " done"