[cig-commits] r22025 - seismo/2D/SPECFEM2D/trunk/src/meshfem2D

[xie.zhinan at geodynamics.org]

Author: xie.zhinan
Date: 2013-05-10 04:40:47 -0700 (Fri, 10 May 2013)
New Revision: 22025

Modified:
   seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90
Log:
fix one error in using undefined variable STACEY_ABSORBING_CONDITIONS


Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90	2013-05-10 03:54:23 UTC (rev 22024)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90	2013-05-10 11:40:47 UTC (rev 22025)
@@ -479,13 +479,13 @@
   if(add_Bielak_conditions .and. .not. any_abs) &
     stop 'need STACEY_ABSORBING_CONDITIONS set to .true. in order to use add_Bielak_conditions'
 
+  ! CPML and Stacey are mutually exclusive
+  if(any_abs .and. PML_BOUNDARY_CONDITIONS) &
+    stop 'STACEY_ABSORBING_CONDITIONS and PML_BOUNDARY_CONDITIONS are mutually exclusive but are both set to .true.'
+
   ! solve the conflict in value of PML_BOUNDARY_CONDITIONS and STACEY_ABSORBING_CONDITIONS
   if(PML_BOUNDARY_CONDITIONS) any_abs = .true.
 
-  ! CPML and Stacey are mutually exclusive
-  if(STACEY_ABSORBING_CONDITIONS .and. PML_BOUNDARY_CONDITIONS) &
-    stop 'STACEY_ABSORBING_CONDITIONS and PML_BOUNDARY_CONDITIONS are mutually exclusive but are both set to .true.'
-
   call read_value_logical_p(ADD_SPRING_TO_STACEY, 'solver.ADD_SPRING_TO_STACEY')
   if(err_occurred() /= 0) stop 'error reading parameter 51a in Par_file'