[cig-commits] r12553 - seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Wed Aug 6 13:54:46 PDT 2008
Author: dkomati1
Date: 2008-08-06 13:54:46 -0700 (Wed, 06 Aug 2008)
New Revision: 12553
Removed:
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/allocate_after_1.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/deallocate.f90
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call1.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call2.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/declar.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90
Log:
converted allocate_after_1.f90 and deallocate.f90 from heap to stack
Deleted: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/allocate_after_1.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/allocate_after_1.f90 2008-08-06 20:21:39 UTC (rev 12552)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/allocate_after_1.f90 2008-08-06 20:54:46 UTC (rev 12553)
@@ -1,228 +0,0 @@
-
- allocate(xstore_crust_mantle(NGLOB_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(ystore_crust_mantle(NGLOB_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(zstore_crust_mantle(NGLOB_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
-
- allocate(xstore_outer_core(NGLOB_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
-
-
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(ystore_outer_core(NGLOB_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
-
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(zstore_outer_core(NGLOB_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
-
- allocate(xstore_inner_core(NGLOB_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(ystore_inner_core(NGLOB_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(zstore_inner_core(NGLOB_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
-
-!---
-
- allocate(xix_crust_mantle(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(xiy_crust_mantle(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(xiz_crust_mantle(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(etax_crust_mantle(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(etay_crust_mantle(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(etaz_crust_mantle(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(gammax_crust_mantle(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(gammay_crust_mantle(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(gammaz_crust_mantle(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
-
- allocate(xix_outer_core(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(xiy_outer_core(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(xiz_outer_core(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(etax_outer_core(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(etay_outer_core(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(etaz_outer_core(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(gammax_outer_core(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(gammay_outer_core(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(gammaz_outer_core(NGLLX,NGLLY,NGLLZ,NSPEC_OUTER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
-
- allocate(xix_inner_core(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(xiy_inner_core(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(xiz_inner_core(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(etax_inner_core(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(etay_inner_core(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(etaz_inner_core(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(gammax_inner_core(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(gammay_inner_core(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
- allocate(gammaz_inner_core(NGLLX,NGLLY,NGLLZ,NSPEC_INNER_CORE),stat=ier)
- if(ier /= 0) then
- print *,"ABORTING can not allocate in allocate_after_1 ier=",ier
- call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
- endif
-
-
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call1.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call1.f90 2008-08-06 20:21:39 UTC (rev 12552)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call1.f90 2008-08-06 20:54:46 UTC (rev 12553)
@@ -25,15 +25,9 @@
npoin2D_faces_crust_mantle,npoin2D_xi_crust_mantle,npoin2D_eta_crust_mantle, &
npoin2D_faces_outer_core,npoin2D_xi_outer_core,npoin2D_eta_outer_core, &
npoin2D_faces_inner_core,npoin2D_xi_inner_core,npoin2D_eta_inner_core, &
-!! DK DK recomputed after the end of the mesher and before the beginning of the solver
- xstore_crust_mantle,ystore_crust_mantle,zstore_crust_mantle,xstore_outer_core,ystore_outer_core,zstore_outer_core, &
-xstore_inner_core,ystore_inner_core,zstore_inner_core, &
-xix_crust_mantle,xiy_crust_mantle,xiz_crust_mantle,etax_crust_mantle,etay_crust_mantle, &
- etaz_crust_mantle,gammax_crust_mantle,gammay_crust_mantle,gammaz_crust_mantle, &
-xix_outer_core,xiy_outer_core,xiz_outer_core,etax_outer_core,etay_outer_core, &
-etaz_outer_core,gammax_outer_core,gammay_outer_core,gammaz_outer_core, &
- xix_inner_core,xiy_inner_core,xiz_inner_core,etax_inner_core,etay_inner_core, &
- etaz_inner_core,gammax_inner_core,gammay_inner_core,gammaz_inner_core, &
+ xelm_store_crust_mantle,yelm_store_crust_mantle,zelm_store_crust_mantle, &
+ xelm_store_outer_core,yelm_store_outer_core,zelm_store_outer_core, &
+ xelm_store_inner_core,yelm_store_inner_core,zelm_store_inner_core, &
!! DK DK do not need to be initialized
buffer_send_chunkcorners_scalar,buffer_recv_chunkcorners_scalar, &
buffer_send_chunkcorners_vector,buffer_recv_chunkcorners_vector)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call2.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call2.f90 2008-08-06 20:21:39 UTC (rev 12552)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call2.f90 2008-08-06 20:54:46 UTC (rev 12553)
@@ -25,15 +25,9 @@
npoin2D_faces_crust_mantle,npoin2D_xi_crust_mantle,npoin2D_eta_crust_mantle, &
npoin2D_faces_outer_core,npoin2D_xi_outer_core,npoin2D_eta_outer_core, &
npoin2D_faces_inner_core,npoin2D_xi_inner_core,npoin2D_eta_inner_core, &
-!! DK DK recomputed after the end of the mesher and before the beginning of the solver
- xstore_crust_mantle,ystore_crust_mantle,zstore_crust_mantle,xstore_outer_core,ystore_outer_core,zstore_outer_core, &
-xstore_inner_core,ystore_inner_core,zstore_inner_core, &
-xix_crust_mantle,xiy_crust_mantle,xiz_crust_mantle,etax_crust_mantle,etay_crust_mantle, &
- etaz_crust_mantle,gammax_crust_mantle,gammay_crust_mantle,gammaz_crust_mantle, &
-xix_outer_core,xiy_outer_core,xiz_outer_core,etax_outer_core,etay_outer_core, &
-etaz_outer_core,gammax_outer_core,gammay_outer_core,gammaz_outer_core, &
- xix_inner_core,xiy_inner_core,xiz_inner_core,etax_inner_core,etay_inner_core, &
- etaz_inner_core,gammax_inner_core,gammay_inner_core,gammaz_inner_core, &
+ xelm_store_crust_mantle,yelm_store_crust_mantle,zelm_store_crust_mantle, &
+ xelm_store_outer_core,yelm_store_outer_core,zelm_store_outer_core, &
+ xelm_store_inner_core,yelm_store_inner_core,zelm_store_inner_core, &
!! DK DK do not need to be initialized
buffer_send_chunkcorners_scalar,buffer_recv_chunkcorners_scalar, &
buffer_send_chunkcorners_vector,buffer_recv_chunkcorners_vector)
Deleted: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/deallocate.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/deallocate.f90 2008-08-06 20:21:39 UTC (rev 12552)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/deallocate.f90 2008-08-06 20:54:46 UTC (rev 12553)
@@ -1,190 +0,0 @@
-
-!! DK DK this for the new merged version
-
- deallocate(xstore_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(ystore_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(zstore_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
- deallocate(xstore_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(ystore_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(zstore_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
- deallocate(xstore_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(ystore_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(zstore_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
-!---
-
- deallocate(xix_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(xiy_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(xiz_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(etax_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(etay_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(etaz_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(gammax_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(gammay_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(gammaz_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
- deallocate(xix_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(xiy_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(xiz_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(etax_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(etay_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(etaz_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(gammax_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(gammay_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(gammaz_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
- deallocate(xix_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(xiy_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(xiz_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(etax_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(etay_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(etaz_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(gammax_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(gammay_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(gammaz_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/declar.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/declar.f90 2008-08-06 20:21:39 UTC (rev 12552)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/declar.f90 2008-08-06 20:54:46 UTC (rev 12553)
@@ -6,23 +6,6 @@
xelm_store_outer_core,yelm_store_outer_core,zelm_store_outer_core, &
xelm_store_inner_core,yelm_store_inner_core,zelm_store_inner_core
- real(kind=CUSTOM_REAL), allocatable, dimension(:,:,:,:) :: &
- xix_crust_mantle,xiy_crust_mantle,xiz_crust_mantle,&
- etax_crust_mantle,etay_crust_mantle,etaz_crust_mantle, &
- gammax_crust_mantle,gammay_crust_mantle,gammaz_crust_mantle
- real(kind=CUSTOM_REAL), allocatable, dimension(:) :: xstore_crust_mantle,ystore_crust_mantle,zstore_crust_mantle
- real(kind=CUSTOM_REAL), allocatable, dimension(:,:,:,:) :: &
- xix_outer_core,xiy_outer_core,xiz_outer_core,&
- etax_outer_core,etay_outer_core,etaz_outer_core, &
- gammax_outer_core,gammay_outer_core,gammaz_outer_core
- real(kind=CUSTOM_REAL), allocatable, dimension(:) :: xstore_outer_core,ystore_outer_core,zstore_outer_core
- real(kind=CUSTOM_REAL), allocatable, dimension(:,:,:,:) :: &
- xix_inner_core,xiy_inner_core,xiz_inner_core,&
- etax_inner_core,etay_inner_core,etaz_inner_core, &
- gammax_inner_core,gammay_inner_core,gammaz_inner_core
-
- real(kind=CUSTOM_REAL), allocatable, dimension(:) :: xstore_inner_core,ystore_inner_core,zstore_inner_core
-
!!!!!!!!!!!!!!!! DK DK for merged version, all the arrays below are allocated statically instead
!!!!!!!!!!!!!!!! DK DK for merged version, all the arrays below are allocated statically instead
!!!!!!!!!!!!!!!! DK DK for merged version, all the arrays below are allocated statically instead
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90 2008-08-06 20:21:39 UTC (rev 12552)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90 2008-08-06 20:54:46 UTC (rev 12553)
@@ -2071,54 +2071,10 @@
npoin2D_eta_inner_core(2) = npoin2D_eta_inner_core(1)
!! DK DK for the merged version
- include 'allocate_after_1.f90'
-
-!! DK DK recompute arrays here for merged version
- call recompute_missing_arrays(myrank, &
- xix_crust_mantle,xiy_crust_mantle,xiz_crust_mantle, &
- etax_crust_mantle,etay_crust_mantle,etaz_crust_mantle, &
- gammax_crust_mantle,gammay_crust_mantle,gammaz_crust_mantle, &
- xstore_crust_mantle,ystore_crust_mantle,zstore_crust_mantle, &
- xelm_store_crust_mantle,yelm_store_crust_mantle,zelm_store_crust_mantle, &
- ibool_crust_mantle,NSPEC_CRUST_MANTLE,NGLOB_CRUST_MANTLE)
-
- call recompute_missing_arrays(myrank, &
- xix_outer_core,xiy_outer_core,xiz_outer_core, &
- etax_outer_core,etay_outer_core,etaz_outer_core, &
- gammax_outer_core,gammay_outer_core,gammaz_outer_core, &
- xstore_outer_core,ystore_outer_core,zstore_outer_core, &
- xelm_store_outer_core,yelm_store_outer_core,zelm_store_outer_core, &
- ibool_outer_core,NSPEC_OUTER_CORE,NGLOB_OUTER_CORE)
-
- call recompute_missing_arrays(myrank, &
- xix_inner_core,xiy_inner_core,xiz_inner_core, &
- etax_inner_core,etay_inner_core,etaz_inner_core, &
- gammax_inner_core,gammay_inner_core,gammaz_inner_core, &
- xstore_inner_core,ystore_inner_core,zstore_inner_core, &
- xelm_store_inner_core,yelm_store_inner_core,zelm_store_inner_core, &
- ibool_inner_core,NSPEC_INNER_CORE,NGLOB_INNER_CORE)
-
-!! DK DK for merged version, deallocate arrays that have become useless
- deallocate(xelm_store_crust_mantle)
- deallocate(yelm_store_crust_mantle)
- deallocate(zelm_store_crust_mantle)
-
- deallocate(xelm_store_outer_core)
- deallocate(yelm_store_outer_core)
- deallocate(zelm_store_outer_core)
-
- deallocate(xelm_store_inner_core)
- deallocate(yelm_store_inner_core)
- deallocate(zelm_store_inner_core)
-
-!! DK DK for the merged version
include 'call1.f90'
!! DK DK for now use variables just to make sure we don't get warning about unused variables
! include 'oldstuff/dummy_use_variables.f90'
-!! DK DK for the merged version
- include 'deallocate.f90'
-
!!!!!!!! DK DK solver inserted here
!!!!!!!! DK DK solver inserted here
!!!!!!!! DK DK solver inserted here
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90 2008-08-06 20:21:39 UTC (rev 12552)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90 2008-08-06 20:54:46 UTC (rev 12553)
@@ -614,8 +614,53 @@
integer, dimension(NB_SQUARE_CORNERS,NB_CUT_CASE) :: DIFF_NSPEC1D_RADIAL
integer, dimension(NB_SQUARE_EDGES_ONEDIR,NB_CUT_CASE) :: DIFF_NSPEC2D_XI,DIFF_NSPEC2D_ETA
+!! DK DK added this for merged version
+!! DK DK stored in single precision for merged version, check if it precise enough (probably yes)
+ real(kind=CUSTOM_REAL), dimension(NGNOD,NSPEC_CRUST_MANTLE) :: xelm_store_crust_mantle,yelm_store_crust_mantle,zelm_store_crust_mantle
+ real(kind=CUSTOM_REAL), dimension(NGNOD,NSPEC_OUTER_CORE) :: xelm_store_outer_core,yelm_store_outer_core,zelm_store_outer_core
+ real(kind=CUSTOM_REAL), dimension(NGNOD,NSPEC_INNER_CORE) :: xelm_store_inner_core,yelm_store_inner_core,zelm_store_inner_core
+
! ************** PROGRAM STARTS HERE **************
+!! DK DK recompute arrays here for merged version
+ call recompute_missing_arrays(myrank, &
+ xix_crust_mantle,xiy_crust_mantle,xiz_crust_mantle, &
+ etax_crust_mantle,etay_crust_mantle,etaz_crust_mantle, &
+ gammax_crust_mantle,gammay_crust_mantle,gammaz_crust_mantle, &
+ xstore_crust_mantle,ystore_crust_mantle,zstore_crust_mantle, &
+ xelm_store_crust_mantle,yelm_store_crust_mantle,zelm_store_crust_mantle, &
+ ibool_crust_mantle,NSPEC_CRUST_MANTLE,NGLOB_CRUST_MANTLE)
+
+ call recompute_missing_arrays(myrank, &
+ xix_outer_core,xiy_outer_core,xiz_outer_core, &
+ etax_outer_core,etay_outer_core,etaz_outer_core, &
+ gammax_outer_core,gammay_outer_core,gammaz_outer_core, &
+ xstore_outer_core,ystore_outer_core,zstore_outer_core, &
+ xelm_store_outer_core,yelm_store_outer_core,zelm_store_outer_core, &
+ ibool_outer_core,NSPEC_OUTER_CORE,NGLOB_OUTER_CORE)
+
+ call recompute_missing_arrays(myrank, &
+ xix_inner_core,xiy_inner_core,xiz_inner_core, &
+ etax_inner_core,etay_inner_core,etaz_inner_core, &
+ gammax_inner_core,gammay_inner_core,gammaz_inner_core, &
+ xstore_inner_core,ystore_inner_core,zstore_inner_core, &
+ xelm_store_inner_core,yelm_store_inner_core,zelm_store_inner_core, &
+ ibool_inner_core,NSPEC_INNER_CORE,NGLOB_INNER_CORE)
+
+!! DK DK for merged version, deallocate arrays that have become useless
+!! DK DK attention je ne peux plus desallouer ici pour l'instant
+!! DK DK impossible YYYYYYYYYYYYY deallocate(xelm_store_crust_mantle)
+!! DK DK impossible YYYYYYYYYYYYY deallocate(yelm_store_crust_mantle)
+!! DK DK impossible YYYYYYYYYYYYY deallocate(zelm_store_crust_mantle)
+
+!! DK DK impossible YYYYYYYYYYYYY deallocate(xelm_store_outer_core)
+!! DK DK impossible YYYYYYYYYYYYY deallocate(yelm_store_outer_core)
+!! DK DK impossible YYYYYYYYYYYYY deallocate(zelm_store_outer_core)
+
+!! DK DK impossible YYYYYYYYYYYYY deallocate(xelm_store_inner_core)
+!! DK DK impossible YYYYYYYYYYYYY deallocate(yelm_store_inner_core)
+!! DK DK impossible YYYYYYYYYYYYY deallocate(zelm_store_inner_core)
+
! initialize the MPI communicator and start the NPROCTOT MPI processes.
!! DK DK suppressed for merged version call MPI_INIT(ier)
More information about the cig-commits
mailing list