[cig-commits] r8557 - in seismo/2D/SPECFEM2D/trunk: . UTILS/sun_grid_engine_UPPA

[walter at geodynamics.org]

Author: walter
Date: 2007-12-07 15:56:15 -0800 (Fri, 07 Dec 2007)
New Revision: 8557

Modified:
   seismo/2D/SPECFEM2D/trunk/Makefile
   seismo/2D/SPECFEM2D/trunk/UTILS/sun_grid_engine_UPPA/qsub_UPPA_parallel.sh
   seismo/2D/SPECFEM2D/trunk/UTILS/sun_grid_engine_UPPA/submit_sun_grid_engine_UPPA_parallel.sh
Log:
using pgf90 as default compiler.

Modified: seismo/2D/SPECFEM2D/trunk/Makefile
===================================================================
--- seismo/2D/SPECFEM2D/trunk/Makefile	2007-07-18 09:29:19 UTC (rev 8556)
+++ seismo/2D/SPECFEM2D/trunk/Makefile	2007-12-07 23:56:15 UTC (rev 8557)
@@ -8,9 +8,10 @@
 O = obj
 
 # Portland
-#F90 = pgf90
-#FLAGS_NOCHECK=-fast -Mnobounds -Minline -Mneginfo -Mdclchk -Knoieee -Minform=warn -fastsse -tp amd64e -Msmart
-#FLAGS_CHECK=-fast -Mbounds -Mneginfo -Mdclchk -Minform=warn
+#F90 = /opt/openmpi-1.2.2/pgi64/bin/mpif90 -DUSE_MPI -DUSE_METIS -DUSE_SCOTCH
+F90 = pgf90
+FLAGS_NOCHECK=-fast -Mnobounds -Minline -Mneginfo -Mdclchk -Knoieee -Minform=warn -fastsse -tp amd64e -Msmart -Mipa=fast,inline
+FLAGS_CHECK=-fast -Mbounds -Mneginfo -Mdclchk -Minform=warn
 
 # Intel
 #F90 = ifort
@@ -19,10 +20,10 @@
 
 # GNU gfortran
 #F90 = /opt/openmpi-1.2.1/gfortran64/bin/mpif90 -DUSE_MPI -DUSE_METIS -DUSE_SCOTCH
-F90 = gfortran
+#F90 = gfortran
 #FLAGS_NOCHECK = -O3 -march=opteron -m64 -mfpmath=sse,387
-FLAGS_NOCHECK = -std=gnu -fimplicit-none -frange-check -O2 -Wunused-labels -Waliasing -Wampersand -Wsurprising -Wline-truncation -Wunderflow
-FLAGS_CHECK = $(FLAGS_NOCHECK) -fbounds-check
+#FLAGS_NOCHECK = -std=gnu -fimplicit-none -frange-check -O2 -Wunused-labels -Waliasing -Wampersand -Wsurprising -Wline-truncation -Wunderflow
+#FLAGS_CHECK = $(FLAGS_NOCHECK) -fbounds-check
 
 LINK = $(F90)
 
@@ -45,7 +46,7 @@
 all: default
 
 clean:
-	/bin/rm -r -f xmeshfem2D xmeshfem2D.trace xspecfem2D xspecfem2D.trace $O/*.o *.o $O/*.il *.mod core xconvolve_source_timefunction
+	/bin/rm -r -f xmeshfem2D xmeshfem2D.trace xspecfem2D xspecfem2D.trace $O/*.o *.o $O/*.il *.mod core xconvolve_source_timefunction *.oo *.ipo
 
 meshfem2D: $(OBJS_MESHFEM2D)
 	$(LINK) $(FLAGS_CHECK) -o xmeshfem2D $(OBJS_MESHFEM2D) $(LIB)

Modified: seismo/2D/SPECFEM2D/trunk/UTILS/sun_grid_engine_UPPA/qsub_UPPA_parallel.sh
===================================================================
--- seismo/2D/SPECFEM2D/trunk/UTILS/sun_grid_engine_UPPA/qsub_UPPA_parallel.sh	2007-07-18 09:29:19 UTC (rev 8556)
+++ seismo/2D/SPECFEM2D/trunk/UTILS/sun_grid_engine_UPPA/qsub_UPPA_parallel.sh	2007-12-07 23:56:15 UTC (rev 8557)
@@ -89,9 +89,9 @@
 cd /scratch/$USER/$JOB_NAME$JOB_ID
 
 
-LD_LIBRARY_PATH=/opt/openmpi-1.2.1/gfortran64/lib  /opt/openmpi-1.2.1/gfortran64/bin/mpirun -np $NSLOTS ./xspecfem2D
+LD_LIBRARY_PATH=/opt/openmpi-1.2.2/pgi64/lib /opt/openmpi-1.2.2/pgi64/bin/mpirun -np $NSLOTS ./xspecfem2D
 
 scp $host0.univ-pau.fr:/scratch/$USER/$JOB_NAME$JOB_ID/OUTPUT_FILES/* $CURRENT_DIR/OUTPUT_FILES/
 
-LD_LIBRARY_PATH=/opt/openmpi-1.2.1/gfortran64/lib  /opt/openmpi-1.2.1/gfortran64/bin/mpirun -np $NSLOTS ../clean_scratch_UPPA.sh $USER $JOB_NAME $JOB_ID
+LD_LIBRARY_PATH=/opt/openmpi-1.2.2/pgi64/lib /opt/openmpi-1.2.2/pgi64/bin/mpirun -np $NSLOTS ../clean_scratch_UPPA.sh $USER $JOB_NAME $JOB_ID
 

Modified: seismo/2D/SPECFEM2D/trunk/UTILS/sun_grid_engine_UPPA/submit_sun_grid_engine_UPPA_parallel.sh
===================================================================
--- seismo/2D/SPECFEM2D/trunk/UTILS/sun_grid_engine_UPPA/submit_sun_grid_engine_UPPA_parallel.sh	2007-07-18 09:29:19 UTC (rev 8556)
+++ seismo/2D/SPECFEM2D/trunk/UTILS/sun_grid_engine_UPPA/submit_sun_grid_engine_UPPA_parallel.sh	2007-12-07 23:56:15 UTC (rev 8557)
@@ -19,7 +19,7 @@
 
 rm ./OUTPUT_FILES/Database*
 
-LD_LIBRARY_PATH=/opt/openmpi-1.2.1/gfortran64/lib ./xmeshfem2D
+LD_LIBRARY_PATH=/opt/openmpi-1.2.2/pgi64/lib ./xmeshfem2D
 
 qsub -pe openmpi 8 ./qsub_UPPA_parallel.sh