[cig-commits] r15687 - in seismo/2D/SPECFEM2D/trunk: . DATA
cmorency at geodynamics.org
cmorency at geodynamics.org
Wed Sep 23 10:08:08 PDT 2009
Author: cmorency
Date: 2009-09-23 10:08:07 -0700 (Wed, 23 Sep 2009)
New Revision: 15687
Modified:
seismo/2D/SPECFEM2D/trunk/DATA/STATIONS
seismo/2D/SPECFEM2D/trunk/assemble_MPI.F90
seismo/2D/SPECFEM2D/trunk/specfem2D.F90
Log:
Fixed MPI calculation for P-SV & SH. Dimension is now 3 for elastic variables in assemble_MPI.F90.
Modified: seismo/2D/SPECFEM2D/trunk/DATA/STATIONS
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/STATIONS 2009-09-20 23:59:15 UTC (rev 15686)
+++ seismo/2D/SPECFEM2D/trunk/DATA/STATIONS 2009-09-23 17:08:07 UTC (rev 15687)
@@ -1,100 +1,20 @@
-S0001 AA 0.0000000 -30.0000000 0.0 0.0
-S0002 AA 131.3131313 -30.0000000 0.0 0.0
-S0003 AA 262.6262626 -30.0000000 0.0 0.0
-S0004 AA 393.9393939 -30.0000000 0.0 0.0
-S0005 AA 525.2525253 -30.0000000 0.0 0.0
-S0006 AA 656.5656566 -30.0000000 0.0 0.0
-S0007 AA 787.8787879 -30.0000000 0.0 0.0
-S0008 AA 919.1919192 -30.0000000 0.0 0.0
-S0009 AA 1050.5050505 -30.0000000 0.0 0.0
-S0010 AA 1181.8181818 -30.0000000 0.0 0.0
-S0011 AA 1313.1313131 -30.0000000 0.0 0.0
-S0012 AA 1444.4444444 -30.0000000 0.0 0.0
-S0013 AA 1575.7575758 -30.0000000 0.0 0.0
-S0014 AA 1707.0707071 -30.0000000 0.0 0.0
-S0015 AA 1838.3838384 -30.0000000 0.0 0.0
-S0016 AA 1969.6969697 -30.0000000 0.0 0.0
-S0017 AA 2101.0101010 -30.0000000 0.0 0.0
-S0018 AA 2232.3232323 -30.0000000 0.0 0.0
-S0019 AA 2363.6363636 -30.0000000 0.0 0.0
-S0020 AA 2494.9494949 -30.0000000 0.0 0.0
-S0021 AA 2626.2626263 -30.0000000 0.0 0.0
-S0022 AA 2757.5757576 -30.0000000 0.0 0.0
-S0023 AA 2888.8888889 -30.0000000 0.0 0.0
-S0024 AA 3020.2020202 -30.0000000 0.0 0.0
-S0025 AA 3151.5151515 -30.0000000 0.0 0.0
-S0026 AA 3282.8282828 -30.0000000 0.0 0.0
-S0027 AA 3414.1414141 -30.0000000 0.0 0.0
-S0028 AA 3545.4545455 -30.0000000 0.0 0.0
-S0029 AA 3676.7676768 -30.0000000 0.0 0.0
-S0030 AA 3808.0808081 -30.0000000 0.0 0.0
-S0031 AA 3939.3939394 -30.0000000 0.0 0.0
-S0032 AA 4070.7070707 -30.0000000 0.0 0.0
-S0033 AA 4202.0202020 -30.0000000 0.0 0.0
-S0034 AA 4333.3333333 -30.0000000 0.0 0.0
-S0035 AA 4464.6464646 -30.0000000 0.0 0.0
-S0036 AA 4595.9595960 -30.0000000 0.0 0.0
-S0037 AA 4727.2727273 -30.0000000 0.0 0.0
-S0038 AA 4858.5858586 -30.0000000 0.0 0.0
-S0039 AA 4989.8989899 -30.0000000 0.0 0.0
-S0040 AA 5121.2121212 -30.0000000 0.0 0.0
-S0041 AA 5252.5252525 -30.0000000 0.0 0.0
-S0042 AA 5383.8383838 -30.0000000 0.0 0.0
-S0043 AA 5515.1515152 -30.0000000 0.0 0.0
-S0044 AA 5646.4646465 -30.0000000 0.0 0.0
-S0045 AA 5777.7777778 -30.0000000 0.0 0.0
-S0046 AA 5909.0909091 -30.0000000 0.0 0.0
-S0047 AA 6040.4040404 -30.0000000 0.0 0.0
-S0048 AA 6171.7171717 -30.0000000 0.0 0.0
-S0049 AA 6303.0303030 -30.0000000 0.0 0.0
-S0050 AA 6434.3434343 -30.0000000 0.0 0.0
-S0051 AA 6565.6565657 -30.0000000 0.0 0.0
-S0052 AA 6696.9696970 -30.0000000 0.0 0.0
-S0053 AA 6828.2828283 -30.0000000 0.0 0.0
-S0054 AA 6959.5959596 -30.0000000 0.0 0.0
-S0055 AA 7090.9090909 -30.0000000 0.0 0.0
-S0056 AA 7222.2222222 -30.0000000 0.0 0.0
-S0057 AA 7353.5353535 -30.0000000 0.0 0.0
-S0058 AA 7484.8484848 -30.0000000 0.0 0.0
-S0059 AA 7616.1616162 -30.0000000 0.0 0.0
-S0060 AA 7747.4747475 -30.0000000 0.0 0.0
-S0061 AA 7878.7878788 -30.0000000 0.0 0.0
-S0062 AA 8010.1010101 -30.0000000 0.0 0.0
-S0063 AA 8141.4141414 -30.0000000 0.0 0.0
-S0064 AA 8272.7272727 -30.0000000 0.0 0.0
-S0065 AA 8404.0404040 -30.0000000 0.0 0.0
-S0066 AA 8535.3535354 -30.0000000 0.0 0.0
-S0067 AA 8666.6666667 -30.0000000 0.0 0.0
-S0068 AA 8797.9797980 -30.0000000 0.0 0.0
-S0069 AA 8929.2929293 -30.0000000 0.0 0.0
-S0070 AA 9060.6060606 -30.0000000 0.0 0.0
-S0071 AA 9191.9191919 -30.0000000 0.0 0.0
-S0072 AA 9323.2323232 -30.0000000 0.0 0.0
-S0073 AA 9454.5454545 -30.0000000 0.0 0.0
-S0074 AA 9585.8585859 -30.0000000 0.0 0.0
-S0075 AA 9717.1717172 -30.0000000 0.0 0.0
-S0076 AA 9848.4848485 -30.0000000 0.0 0.0
-S0077 AA 9979.7979798 -30.0000000 0.0 0.0
-S0078 AA 10111.1111111 -30.0000000 0.0 0.0
-S0079 AA 10242.4242424 -30.0000000 0.0 0.0
-S0080 AA 10373.7373737 -30.0000000 0.0 0.0
-S0081 AA 10505.0505051 -30.0000000 0.0 0.0
-S0082 AA 10636.3636364 -30.0000000 0.0 0.0
-S0083 AA 10767.6767677 -30.0000000 0.0 0.0
-S0084 AA 10898.9898990 -30.0000000 0.0 0.0
-S0085 AA 11030.3030303 -30.0000000 0.0 0.0
-S0086 AA 11161.6161616 -30.0000000 0.0 0.0
-S0087 AA 11292.9292929 -30.0000000 0.0 0.0
-S0088 AA 11424.2424242 -30.0000000 0.0 0.0
-S0089 AA 11555.5555556 -30.0000000 0.0 0.0
-S0090 AA 11686.8686869 -30.0000000 0.0 0.0
-S0091 AA 11818.1818182 -30.0000000 0.0 0.0
-S0092 AA 11949.4949495 -30.0000000 0.0 0.0
-S0093 AA 12080.8080808 -30.0000000 0.0 0.0
-S0094 AA 12212.1212121 -30.0000000 0.0 0.0
-S0095 AA 12343.4343434 -30.0000000 0.0 0.0
-S0096 AA 12474.7474747 -30.0000000 0.0 0.0
-S0097 AA 12606.0606061 -30.0000000 0.0 0.0
-S0098 AA 12737.3737374 -30.0000000 0.0 0.0
-S0099 AA 12868.6868687 -30.0000000 0.0 0.0
-S0100 AA 13000.0000000 -30.0000000 0.0 0.0
+S0001 AA 75.0000000 -1000.0000000 0.0 0.0
+S0002 AA 75.0000000 -1010.5263158 0.0 0.0
+S0003 AA 75.0000000 -1021.0526316 0.0 0.0
+S0004 AA 75.0000000 -1031.5789474 0.0 0.0
+S0005 AA 75.0000000 -1042.1052632 0.0 0.0
+S0006 AA 75.0000000 -1052.6315789 0.0 0.0
+S0007 AA 75.0000000 -1063.1578947 0.0 0.0
+S0008 AA 75.0000000 -1073.6842105 0.0 0.0
+S0009 AA 75.0000000 -1084.2105263 0.0 0.0
+S0010 AA 75.0000000 -1094.7368421 0.0 0.0
+S0011 AA 75.0000000 -1105.2631579 0.0 0.0
+S0012 AA 75.0000000 -1115.7894737 0.0 0.0
+S0013 AA 75.0000000 -1126.3157895 0.0 0.0
+S0014 AA 75.0000000 -1136.8421053 0.0 0.0
+S0015 AA 75.0000000 -1147.3684211 0.0 0.0
+S0016 AA 75.0000000 -1157.8947368 0.0 0.0
+S0017 AA 75.0000000 -1168.4210526 0.0 0.0
+S0018 AA 75.0000000 -1178.9473684 0.0 0.0
+S0019 AA 75.0000000 -1189.4736842 0.0 0.0
+S0020 AA 75.0000000 -1200.0000000 0.0 0.0
Modified: seismo/2D/SPECFEM2D/trunk/assemble_MPI.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/assemble_MPI.F90 2009-09-20 23:59:15 UTC (rev 15686)
+++ seismo/2D/SPECFEM2D/trunk/assemble_MPI.F90 2009-09-23 17:08:07 UTC (rev 15687)
@@ -569,7 +569,7 @@
include 'precision_mpi.h'
! array to assemble
- real(kind=CUSTOM_REAL), dimension(NDIM,npoin), intent(inout) :: array_val2
+ real(kind=CUSTOM_REAL), dimension(3,npoin), intent(inout) :: array_val2
integer, intent(in) :: npoin
integer, intent(in) :: ninterface, ninterface_elastic
@@ -598,9 +598,9 @@
ipoin = 0
do i = 1, nibool_interfaces_elastic(num_interface)
- buffer_send_faces_vector_el(ipoin+1:ipoin+2,inum_interface) = &
+ buffer_send_faces_vector_el(ipoin+1:ipoin+3,inum_interface) = &
array_val2(:,ibool_interfaces_elastic(i,num_interface))
- ipoin = ipoin + 2
+ ipoin = ipoin + 3
end do
end do
@@ -610,7 +610,7 @@
num_interface = inum_interfaces_elastic(inum_interface)
call MPI_ISSEND( buffer_send_faces_vector_el(1,inum_interface), &
- NDIM*nibool_interfaces_elastic(num_interface), CUSTOM_MPI_TYPE, &
+ 3*nibool_interfaces_elastic(num_interface), CUSTOM_MPI_TYPE, &
my_neighbours(num_interface), 12, MPI_COMM_WORLD, &
tab_requests_send_recv_elastic(inum_interface), ier)
@@ -619,7 +619,7 @@
end if
call MPI_Irecv ( buffer_recv_faces_vector_el(1,inum_interface), &
- NDIM*nibool_interfaces_elastic(num_interface), CUSTOM_MPI_TYPE, &
+ 3*nibool_interfaces_elastic(num_interface), CUSTOM_MPI_TYPE, &
my_neighbours(num_interface), 12, MPI_COMM_WORLD, &
tab_requests_send_recv_elastic(ninterface_elastic+inum_interface), ier)
@@ -642,8 +642,8 @@
ipoin = 0
do i = 1, nibool_interfaces_elastic(num_interface)
array_val2(:,ibool_interfaces_elastic(i,num_interface)) = array_val2(:,ibool_interfaces_elastic(i,num_interface)) + &
- buffer_recv_faces_vector_el(ipoin+1:ipoin+2,inum_interface)
- ipoin = ipoin + 2
+ buffer_recv_faces_vector_el(ipoin+1:ipoin+3,inum_interface)
+ ipoin = ipoin + 3
end do
end do
Modified: seismo/2D/SPECFEM2D/trunk/specfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/specfem2D.F90 2009-09-20 23:59:15 UTC (rev 15686)
+++ seismo/2D/SPECFEM2D/trunk/specfem2D.F90 2009-09-23 17:08:07 UTC (rev 15687)
@@ -2329,7 +2329,7 @@
endif
max_ibool_interfaces_size_ac = maxval(nibool_interfaces_acoustic(:))
- max_ibool_interfaces_size_el = NDIM*maxval(nibool_interfaces_elastic(:))
+ max_ibool_interfaces_size_el = 3*maxval(nibool_interfaces_elastic(:))
max_ibool_interfaces_size_po = NDIM*maxval(nibool_interfaces_poroelastic(:))
if(ipass == 1) then
allocate(tab_requests_send_recv_acoustic(ninterface_acoustic*2))
More information about the CIG-COMMITS
mailing list