[cig-commits] r9204 - in seismo/2D/SPECFEM2D/trunk: . DATA
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Fri Feb 1 04:55:27 PST 2008
Author: dkomati1
Date: 2008-02-01 04:55:26 -0800 (Fri, 01 Feb 2008)
New Revision: 9204
Modified:
seismo/2D/SPECFEM2D/trunk/DATA/Par_file
seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Abel_Balanche_bathy_source_solid
seismo/2D/SPECFEM2D/trunk/DATA/Par_file_M2_UPPA
seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Ronan_SV_30
seismo/2D/SPECFEM2D/trunk/DATA/Par_file_canyon
seismo/2D/SPECFEM2D/trunk/DATA/Par_file_no_canyon
seismo/2D/SPECFEM2D/trunk/DATA/Par_file_unstruct
seismo/2D/SPECFEM2D/trunk/meshfem2D.F90
seismo/2D/SPECFEM2D/trunk/specfem2D.F90
Log:
changed "partitionning" to "partitioning" everywhere
Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file 2008-02-01 05:33:54 UTC (rev 9203)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file 2008-02-01 12:55:26 UTC (rev 9204)
@@ -11,10 +11,10 @@
free_surface_file = ./DATA/Mesh_canyon/canyon_free_surface_file # file containing the free surface
absorbing_surface_file = ./DATA/Mesh_canyon/canyon_absorbing_surface_file # file containing the absorbing surface
-# parameters concerning partitionning
+# parameters concerning partitioning
nproc = 1 # number of processes
partionning_method = 1 # ascending order = 1, Metis = 2, Scotch = 3
-partitionning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitionning strategy.
+partitioning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitioning strategy.
# geometry of the model (origin lower-left corner = 0,0) and mesh description
xmin = 0.d0 # abscissa of left side of the model
Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Abel_Balanche_bathy_source_solid
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Abel_Balanche_bathy_source_solid 2008-02-01 05:33:54 UTC (rev 9203)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Abel_Balanche_bathy_source_solid 2008-02-01 12:55:26 UTC (rev 9204)
@@ -11,10 +11,10 @@
free_surface_file = ./DATA/Mesh_canyon/canyon_free_surface_file # file containing the free surface
absorbing_surface_file = ./DATA/Mesh_canyon/canyon_absorbing_surface_file # file containing the absorbing surface
-# parameters concerning partitionning
+# parameters concerning partitioning
nproc = 1 # number of processes
partionning_method = 1 # ascending order = 1, Metis = 2, Scotch = 3
-partitionning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitionning strategy.
+partitioning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitioning strategy.
# geometry of the model (origin lower-left corner = 0,0) and mesh description
xmin = 0.d0 # abscissa of left side of the model
Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_M2_UPPA
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_M2_UPPA 2008-02-01 05:33:54 UTC (rev 9203)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_M2_UPPA 2008-02-01 12:55:26 UTC (rev 9204)
@@ -11,10 +11,10 @@
free_surface_file = ./DATA/Mesh_canyon/canyon_free_surface_file # file containing the free surface
absorbing_surface_file = ./DATA/Mesh_canyon/canyon_absorbing_surface_file # file containing the absorbing surface
-# parameters concerning partitionning
+# parameters concerning partitioning
nproc = 1 # number of processes
partionning_method = 1 # ascending order = 1, Metis = 2, Scotch = 3
-partitionning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitionning strategy.
+partitioning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitioning strategy.
# geometry of the model (origin lower-left corner = 0,0) and mesh description
xmin = 0.d0 # abscissa of left side of the model
Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Ronan_SV_30
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Ronan_SV_30 2008-02-01 05:33:54 UTC (rev 9203)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Ronan_SV_30 2008-02-01 12:55:26 UTC (rev 9204)
@@ -11,10 +11,10 @@
free_surface_file = ./DATA/unstructured_fluide_solide_test/surface_free # file containing the free surface
absorbing_surface_file = ./DATA/unstructured_fluide_solide_test/surface_abs # file containing the absorbing surface
-# parameters concerning partitionning
+# parameters concerning partitioning
nproc = 1 # number of processes
partionning_method = 1 # ascending order = 1, Metis = 2, Scotch = 3
-partitionning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitionning strategy.
+partitioning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitioning strategy.
# geometry of the model (origin lower-left corner = 0,0) and mesh description
xmin = 0.d0 # abscissa of left side of the model
Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_canyon
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_canyon 2008-02-01 05:33:54 UTC (rev 9203)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_canyon 2008-02-01 12:55:26 UTC (rev 9204)
@@ -11,10 +11,10 @@
free_surface_file = ./DATA/Mesh_canyon/canyon_free_surface_file # file containing the free surface
absorbing_surface_file = ./DATA/Mesh_canyon/canyon_absorbing_surface_file # file containing the absorbing surface
-# parameters concerning partitionning
+# parameters concerning partitioning
nproc = 1 # number of processes
partionning_method = 1 # ascending order = 1, Metis = 2, Scotch = 3
-partitionning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitionning strategy.
+partitioning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitioning strategy.
# geometry of the model (origin lower-left corner = 0,0) and mesh description
xmin = 0.d0 # abscissa of left side of the model
Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_no_canyon
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_no_canyon 2008-02-01 05:33:54 UTC (rev 9203)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_no_canyon 2008-02-01 12:55:26 UTC (rev 9204)
@@ -11,10 +11,10 @@
free_surface_file = ./DATA/Mesh_canyon/canyon_free_surface_file # file containing the free surface
absorbing_surface_file = ./DATA/Mesh_canyon/canyon_absorbing_surface_file # file containing the absorbing surface
-# parameters concerning partitionning
+# parameters concerning partitioning
nproc = 1 # number of processes
partionning_method = 1 # ascending order = 1, Metis = 2, Scotch = 3
-partitionning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitionning strategy.
+partitioning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitioning strategy.
# geometry of the model (origin lower-left corner = 0,0) and mesh description
xmin = 0.d0 # abscissa of left side of the model
Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_unstruct
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_unstruct 2008-02-01 05:33:54 UTC (rev 9203)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_unstruct 2008-02-01 12:55:26 UTC (rev 9204)
@@ -11,10 +11,10 @@
free_surface_file = ./DATA/unstructured_fluide_solide_test/surface_free # file containing the free surface
absorbing_surface_file = ./DATA/unstructured_fluide_solide_test/surface_abs # file containing the absorbing surface
-# parameters concerning partitionning
+# parameters concerning partitioning
nproc = 8 # number of processes
partionning_method = 1 # ascending order = 1, Metis = 2, Scotch = 3
-partitionning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitionning strategy.
+partitioning_strategy = 01110 #b{strat=m{asc=g,low=g,rat=1.0,type=h,vert=4}} #01110 # options concerning partitioning strategy.
# geometry of the model (origin lower-left corner = 0,0) and mesh description
xmin = 0.d0 # abscissa of left side of the model
Modified: seismo/2D/SPECFEM2D/trunk/meshfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/meshfem2D.F90 2008-02-01 05:33:54 UTC (rev 9203)
+++ seismo/2D/SPECFEM2D/trunk/meshfem2D.F90 2008-02-01 12:55:26 UTC (rev 9204)
@@ -186,10 +186,10 @@
integer, dimension(:), pointer :: ibegin_bottom,iend_bottom,ibegin_top,iend_top, &
jbegin_left,jend_left,jbegin_right,jend_right
-! variables used for partitionning
+! variables used for partitioning
integer :: nproc
- integer :: partitionning_method
- character(len=256) :: partitionning_strategy
+ integer :: partitioning_method
+ character(len=256) :: partitioning_strategy
character(len=256) :: scotch_strategy
integer, dimension(0:4) :: metis_options
character(len=256) :: prname
@@ -233,7 +233,7 @@
call read_value_string(IIN,IGNORE_JUNK,free_surface_file)
call read_value_string(IIN,IGNORE_JUNK,absorbing_surface_file)
-! read info about partitionning
+! read info about partitioning
call read_value_integer(IIN,IGNORE_JUNK,nproc)
if ( nproc <= 0 ) then
print *, 'Number of processes (nproc) must be greater than or equal to one.'
@@ -249,26 +249,26 @@
#endif
- call read_value_integer(IIN,IGNORE_JUNK,partitionning_method)
- call read_value_string(IIN,IGNORE_JUNK,partitionning_strategy)
- select case(partitionning_method)
+ call read_value_integer(IIN,IGNORE_JUNK,partitioning_method)
+ call read_value_string(IIN,IGNORE_JUNK,partitioning_strategy)
+ select case(partitioning_method)
case(1)
case(2)
- partitionning_strategy = trim(partitionning_strategy)
- if ( partitionning_strategy(1:1) == '0' ) then
+ partitioning_strategy = trim(partitioning_strategy)
+ if ( partitioning_strategy(1:1) == '0' ) then
metis_options(0) = 0
else
do i = 1, 5
- metis_options = iachar(partitionning_strategy(i:i)) - iachar('0')
+ metis_options = iachar(partitioning_strategy(i:i)) - iachar('0')
end do
endif
case(3)
- scotch_strategy = trim(partitionning_strategy)
+ scotch_strategy = trim(partitioning_strategy)
case default
print *, 'Invalid partionning method number.'
- print *, 'Partionning method', partitionning_method, 'was requested, but is not available.'
+ print *, 'Partionning method', partitioning_method, 'was requested, but is not available.'
stop
end select
@@ -934,9 +934,9 @@
endif
- !*****************************
- ! Partitionning
- !*****************************
+!*****************************
+! partitioning
+!*****************************
allocate(part(0:nelmnts-1))
! if ngnod == 9, we work on a subarray of elmnts, which represents the elements with for nodes only
@@ -969,7 +969,7 @@
call read_weights(nelmnts, vwgt, nb_edges, adjwgt)
! partitioning
- select case (partitionning_method)
+ select case (partitioning_method)
case(1)
do iproc = 0, nproc-2
part(iproc*floor(real(nelmnts)/real(nproc)):(iproc+1)*floor(real(nelmnts)/real(nproc))-1) = iproc
Modified: seismo/2D/SPECFEM2D/trunk/specfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/specfem2D.F90 2008-02-01 05:33:54 UTC (rev 9203)
+++ seismo/2D/SPECFEM2D/trunk/specfem2D.F90 2008-02-01 12:55:26 UTC (rev 9204)
@@ -296,7 +296,7 @@
integer ihours,iminutes,iseconds,int_tCPU
double precision :: time_start,time_end,tCPU
-! for MPI and partitionning
+! for MPI and partitioning
integer :: ier
integer :: nproc
integer :: myrank
More information about the cig-commits
mailing list