Changeset 73 in PSPA for parmelaPSPA

Timestamp:

Nov 14, 2012, 11:45:59 AM (12 years ago)

Author:

touze

Message:

ajout pprincipal

Location:

parmelaPSPA/trunk

Files:

• main.c (added)
• makefile (modified) (2 diffs)
• parmelamainv503.f (modified) (2 diffs)

parmelaPSPA/trunk/makefile

@@ -1 +1 @@
 FF=gfortran
-FFLAGS= -O4 -m32 -fno-second-underscore -funroll-loops -I.
+#FFLAGS= -O4 -m32 -fno-second-underscore -funroll-loops -I.
+FFLAGS= -O4 -fno-second-underscore -funroll-loops -I.
  
 #VER=macOS
- VER=
+VER=
 
 SRC= adjust.f alpham.f bend.f bfld.f bfldlal.f blockdata.f buncher.f byfield.f card.f cathod.f cathode.f cellfeld.f cellimp.f cfield.f change.f cread.f datime.f dawfc.f ddate.f design.f distriphase.f distrir.f distrirhom.f dpout.f drift.f eh.f eint.f elispdp.f emit90dp.f erf.f field.f fieldlal.f file.f fldring.f flds.f fsch.f gammln.f gammp.f gaus.f gcf.f geners.f genfc.f genfld.f gpindp.f graphic.f gser.f indx.f input.f interp.f interv.f irschfgt.f lodgau.f loduni.f luf.f norran.f out1.f out2.f out3.f out4.f out5.f out6dp.f outlaldp.f output.f pardyn.f parmelamainv503.f pdist.f poisson.f prch.f prchold.f pvoldp.f quad.f ranf.f rannor.f rn32.f rndm.f rnorth.f rotate.f rtmfc.f rtrans.f sandom.f sbload.f sccfc.f scheff1.f scheff2.f scheff3.f scwall.f search.f setwall.f sextupole.f solnoid.f sort.f sortie.f spl1d1.f spl1d2.f spl2d1.f spl2d2.f spln1.f spln2.f srchfd.f sscal.f swap.f tank.f trwave.f trwfield.f trwimp.f wiggler.f xi0.f xi10x.f zout.f zoutlal.f
  
 OBJ=$(SRC:.f=.o)
- 
+
+all : parmela
+
+parmela : main.o $(OBJ)
+        gfortran main.o $(OBJ) -o parmela
+
+main.o:main.c
+        gcc -c main.c
+
 adjust.o:adjust.f
          $(FF) -c $(FFLAGS) adjust.f
@@ -339 +348 @@
          $(FF) -c $(FFLAGS) zoutlal.f
  
-parmela: $(OBJ)
-         $(FF)  $(FFLAGS) $(OBJ) -o parmela$(VER)
+
  
 clean:

parmelaPSPA/trunk/parmelamainv503.f

@@ -233 +233 @@
 c++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*
 c-----------------------------------------------------------------------
-      program parmela
+c---->program parmela
+      subroutine parmela()
 c-----------------------------------------------------------------------
 c label n --> n*100
@@ -1085 +1086 @@
       go to 99
       end
+
 c++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*
       subroutine cellfld(cl,nc)