[cig-commits] r12968 - seismo/2D/SPECFEM2D/branches/BIOT

[cmorency at geodynamics.org]

Author: cmorency
Date: 2008-09-24 09:12:19 -0700 (Wed, 24 Sep 2008)
New Revision: 12968

Modified:
   seismo/2D/SPECFEM2D/branches/BIOT/Makefile
   seismo/2D/SPECFEM2D/branches/BIOT/meshfem2D.F90
   seismo/2D/SPECFEM2D/branches/BIOT/part_unstruct.F90
Log:
Correction of subroutine names length in part_unstruct.F90, which was incompatible with ifort compilation.


Modified: seismo/2D/SPECFEM2D/branches/BIOT/Makefile
===================================================================
--- seismo/2D/SPECFEM2D/branches/BIOT/Makefile	2008-09-24 13:57:33 UTC (rev 12967)
+++ seismo/2D/SPECFEM2D/branches/BIOT/Makefile	2008-09-24 16:12:19 UTC (rev 12968)
@@ -54,18 +54,18 @@
 #FLAGS_CHECK=-fast -Mbounds -Mneginfo -Mdclchk -Minform=warn
 
 # Intel
-#F90 = ifort
-#CC = gcc
-#FLAGS_NOCHECK=-O0 -implicitnone -warn stderrors -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -assume byterecl -check nobounds
-#FLAGS_CHECK = $(FLAGS_NOCHECK)
+F90 = ifort
+CC = gcc
+FLAGS_NOCHECK=-O0 -implicitnone -warn stderrors -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -assume byterecl -check nobounds
+FLAGS_CHECK = $(FLAGS_NOCHECK)
 
 # GNU gfortran
 #F90 = /opt/openmpi-1.2.1/gfortran64/bin/mpif90 -DUSE_MPI -DUSE_METIS -DUSE_SCOTCH
-F90 = gfortran
-CC = gcc
+#F90 = gfortran
+#CC = gcc
 #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
 
 # IBM
 #F90 = xlf_r

Modified: seismo/2D/SPECFEM2D/branches/BIOT/meshfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/branches/BIOT/meshfem2D.F90	2008-09-24 13:57:33 UTC (rev 12967)
+++ seismo/2D/SPECFEM2D/branches/BIOT/meshfem2D.F90	2008-09-24 16:12:19 UTC (rev 12968)
@@ -1056,18 +1056,18 @@
   endif
 ! beware of fluid porous edges : coupled elements are transfered to the same partition
   if ( ngnod == 9 ) then
-     call acoustic_poroelastic_repartitioning (nelmnts, nnodes, elmnts_bis, nb_materials, phi, num_material, &
+     call acoustic_poro_repartitioning (nelmnts, nnodes, elmnts_bis, nb_materials, phi, num_material, &
           nproc, part, nedges_acporo_coupled, edges_acporo_coupled)
   else
-     call acoustic_poroelastic_repartitioning (nelmnts, nnodes, elmnts, nb_materials, phi, num_material, &
+     call acoustic_poro_repartitioning (nelmnts, nnodes, elmnts, nb_materials, phi, num_material, &
           nproc, part, nedges_acporo_coupled, edges_acporo_coupled)
   endif
 ! beware of porous solid edges : coupled elements are transfered to the same partition
   if ( ngnod == 9 ) then
-     call poroelastic_elastic_repartitioning (nelmnts, nnodes, elmnts_bis, nb_materials, phi, num_material, &
+     call poro_elastic_repartitioning (nelmnts, nnodes, elmnts_bis, nb_materials, phi, num_material, &
           nproc, part, nedges_elporo_coupled, edges_elporo_coupled)
   else
-     call poroelastic_elastic_repartitioning (nelmnts, nnodes, elmnts, nb_materials, phi, num_material, &
+     call poro_elastic_repartitioning (nelmnts, nnodes, elmnts, nb_materials, phi, num_material, &
           nproc, part, nedges_elporo_coupled, edges_elporo_coupled)
   endif
 

Modified: seismo/2D/SPECFEM2D/branches/BIOT/part_unstruct.F90
===================================================================
--- seismo/2D/SPECFEM2D/branches/BIOT/part_unstruct.F90	2008-09-24 13:57:33 UTC (rev 12967)
+++ seismo/2D/SPECFEM2D/branches/BIOT/part_unstruct.F90	2008-09-24 16:12:19 UTC (rev 12968)
@@ -1554,7 +1554,7 @@
   ! Repartitioning : two coupled acoustic/poroelastic elements are transfered to the same partition
   !--------------------------------------------------
 
-subroutine acoustic_poroelastic_repartitioning (nelmnts, nnodes, elmnts, nb_materials, phi_material, num_material, &
+subroutine acoustic_poro_repartitioning (nelmnts, nnodes, elmnts, nb_materials, phi_material, num_material, &
      nproc, part, nedges_acporo_coupled, edges_acporo_coupled)
 
   implicit none
@@ -1641,13 +1641,13 @@
      end if
   end do
 
-end subroutine acoustic_poroelastic_repartitioning
+end subroutine acoustic_poro_repartitioning
 
   !--------------------------------------------------
   ! Repartitioning : two coupled poroelastic/elastic elements are transfered to the same partition
   !--------------------------------------------------
 
-subroutine poroelastic_elastic_repartitioning (nelmnts, nnodes, elmnts, nb_materials, phi_material, num_material, &
+subroutine poro_elastic_repartitioning (nelmnts, nnodes, elmnts, nb_materials, phi_material, num_material, &
      nproc, part, nedges_elporo_coupled, edges_elporo_coupled)
 
   implicit none
@@ -1734,7 +1734,7 @@
      end if
   end do
 
-end subroutine poroelastic_elastic_repartitioning
+end subroutine poro_elastic_repartitioning
 
 
   !--------------------------------------------------