[cig-commits] r20908 - seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2012-10-24 11:44:06 -0700 (Wed, 24 Oct 2012)
New Revision: 20908

Modified:
   seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/decompose_mesh_SCOTCH.f90
   seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/part_decompose_mesh_SCOTCH.f90
Log:
fixed the default weight for domain decomposition


Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/decompose_mesh_SCOTCH.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/decompose_mesh_SCOTCH.f90	2012-10-24 18:35:56 UTC (rev 20907)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/decompose_mesh_SCOTCH.f90	2012-10-24 18:44:06 UTC (rev 20908)
@@ -685,10 +685,10 @@
     !       (which are counted then as elastic elements)
     num_material(:) = mat(1,:)
 
-    ! uniform load by default, and then
-    ! in case of acoustic/elastic/poro simulation, assign different weights to elements accordingly
 !! DK DK Oct 2012: this should include CPML weights as well in the future
-    elmnts_load(:) = 1
+    ! uniform load by default
+    elmnts_load(:) = ACOUSTIC_LOAD
+    ! then in case of acoustic/elastic/poro simulation, assign different weights to elements accordingly
     call acoustic_elastic_poro_load(elmnts_load,nspec,count_def_mat,count_undef_mat, &
                                   num_material,mat_prop,undef_mat_prop)
 

Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/part_decompose_mesh_SCOTCH.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/part_decompose_mesh_SCOTCH.f90	2012-10-24 18:35:56 UTC (rev 20907)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh_SCOTCH/part_decompose_mesh_SCOTCH.f90	2012-10-24 18:44:06 UTC (rev 20908)
@@ -1342,20 +1342,14 @@
       ! note: num_material index can be negative for tomographic material definitions
       ! acoustic element (cheap)
       if( num_material(el+1) > 0 ) then
-        if ( is_acoustic(num_material(el+1)) ) then
-          elmnts_load(el+1) = elmnts_load(el+1)*ACOUSTIC_LOAD
-        endif
+        if (is_acoustic(num_material(el+1))) elmnts_load(el+1) = ACOUSTIC_LOAD
         ! elastic element (expensive)
-        if ( is_elastic(num_material(el+1)) ) then
-          elmnts_load(el+1) = elmnts_load(el+1)*ELASTIC_LOAD
-        endif
+        if (is_elastic(num_material(el+1))) elmnts_load(el+1) = ELASTIC_LOAD
         ! poroelastic element (very expensive)
-        if ( is_poroelastic(num_material(el+1)) ) then
-          elmnts_load(el+1) = elmnts_load(el+1)*POROELASTIC_LOAD
-        endif
+        if (is_poroelastic(num_material(el+1))) elmnts_load(el+1) = POROELASTIC_LOAD
       else
         ! tomographic materials count as elastic
-        elmnts_load(el+1) = elmnts_load(el+1)*ELASTIC_LOAD
+        elmnts_load(el+1) = ELASTIC_LOAD
       endif
     enddo