[cig-commits] r14005 - seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2009-02-01 17:42:34 -0800 (Sun, 01 Feb 2009)
New Revision: 14005

Modified:
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.F90
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/read_compute_parameters.F90
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.F90
Log:
implemented NEX = 3792 in the mesher for Laura Carrington (San Diego).


Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.F90	2009-02-02 00:36:41 UTC (rev 14004)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.F90	2009-02-02 01:42:34 UTC (rev 14005)
@@ -964,7 +964,9 @@
     MOVIE_SOUTH = bcast_double_precision(30)
 
 ! check that the code is running with the requested number of processes
+#ifdef USE_MPI
   if(sizeprocs /= NPROCTOT) call exit_MPI(myrank,'wrong number of MPI processes')
+#endif
 
   addressing(:,:,:) = 0
   ichunk_slice(:) = 0

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/read_compute_parameters.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/read_compute_parameters.F90	2009-02-02 00:36:41 UTC (rev 14004)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/read_compute_parameters.F90	2009-02-02 01:42:34 UTC (rev 14005)
@@ -736,7 +736,7 @@
  NER_OUTER_CORE =          268
  NER_TOP_CENTRAL_CUBE_ICB =           33
 
-      else  !! DK DK temporary fix for Laura  if(NEX_MAX*multiplication_factor <= 3264) then
+      else if(NEX_MAX*multiplication_factor <= 3264) then
 
 ! simple scaling for the time step
         DT                       = 0.0462d0 * 1248.d0 / dble(NEX_MAX*multiplication_factor)
@@ -754,10 +754,28 @@
  NER_OUTER_CORE =          304
  NER_TOP_CENTRAL_CUBE_ICB =           37
 
-!! DK DK temporary fix for Laura      else
+      else if(NEX_MAX*multiplication_factor <= 3792) then
 
-!! DK DK temporary fix for Laura        stop 'values of NEX_MAX > 3264 not implemented yet in read_compute_parameters'
+! simple scaling for the time step
+        DT                       = 0.0462d0 * 1248.d0 / dble(NEX_MAX*multiplication_factor)
+        R_CENTRAL_CUBE = 985000.d0
 
+ NER_CRUST =            8
+ NER_80_MOHO =            8 !!!!!!!!!!!!!!! 9
+ NER_220_80 =           20
+ NER_400_220 =           27
+ NER_600_400 =           29
+ NER_670_600 =           10
+ NER_771_670 =           15
+ NER_TOPDDOUBLEPRIME_771 =          245
+ NER_CMB_TOPDDOUBLEPRIME =           19 !!!!!!!!!!! 20
+ NER_OUTER_CORE =          304
+ NER_TOP_CENTRAL_CUBE_ICB =           37
+
+      else
+
+        stop 'values of NEX_MAX > 3792 not implemented yet in read_compute_parameters'
+
       endif
 
 ! we cannot honor a two-layer crust with only one element in the crust

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.F90	2009-02-02 00:36:41 UTC (rev 14004)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.F90	2009-02-02 01:42:34 UTC (rev 14005)
@@ -861,7 +861,9 @@
   endif
 
 ! check that the code is running with the requested nb of processes
+#ifdef USE_MPI
   if(sizeprocs /= NPROCTOT) call exit_MPI(myrank,'wrong number of MPI processes')
+#endif
 
 ! check that the code has been compiled with the right values
   if (NSPEC_computed(IREGION_CRUST_MANTLE) /= NSPEC_CRUST_MANTLE) then