diff options
| author | schnetter <schnetter@b7a48df3-cbbf-4440-997f-b4b717c9f7fc> | 2008-04-23 02:53:34 +0000 |
|---|---|---|
| committer | schnetter <schnetter@b7a48df3-cbbf-4440-997f-b4b717c9f7fc> | 2008-04-23 02:53:34 +0000 |
| commit | 6ea7a17b441ff56c7c7e53bbe3c935cd33c59639 (patch) | |
| tree | 1b1e33f44d213482ee4db87033d0b1bb5e5db71f | |
| parent | 540fd961c892fb6cdf03ad166fd49753f9fa50bf (diff) | |
Correct invalid if statement
Explanation: the operator .and. does not short-circuit in Fortran.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/ADMConstraints/trunk@134 b7a48df3-cbbf-4440-997f-b4b717c9f7fc
| -rw-r--r-- | src/ADMConstraints.F | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ADMConstraints.F b/src/ADMConstraints.F index 803d2d8..82c00f8 100644 --- a/src/ADMConstraints.F +++ b/src/ADMConstraints.F @@ -128,10 +128,11 @@ c Calculate constraints. if (use_mask .eq. 1) then if (abs(emask(i,j,k)-1) > 0.001) then docalc = .FALSE. - elseif (check_excision_bitmask .ne. 0 .and. - . SpaceMask_CheckStateBitsF90(space_mask, i, j, k,\ - ex_field, ex_type_excised)) then - docalc = .FALSE. + elseif (check_excision_bitmask .ne. 0) then + if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k,\ + ex_field, ex_type_excised)) then + docalc = .FALSE. + end if end if end if |