--- MITgcm/pkg/shap_filt/shap_filt_apply_ts.F	2001/10/27 02:13:46	1.1
+++ MITgcm/pkg/shap_filt/shap_filt_apply_ts.F	2001/12/11 14:35:02	1.2
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/shap_filt/shap_filt_apply_ts.F,v 1.1 2001/10/27 02:13:46 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/shap_filt/shap_filt_apply_ts.F,v 1.2 2001/12/11 14:35:02 jmc Exp $
 C $Name:  $
 
 #include "SHAP_FILT_OPTIONS.h"
@@ -41,7 +41,6 @@
       _RL  sFld(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)
 
 #ifdef ALLOW_SHAP_FILT
-#ifndef USE_OLD_SHAPIRO_FILTERS 
 
 C !LOCAL VARIABLES: ====================================================
 C none
@@ -50,6 +49,27 @@
 
       IF (nShapT.GT.0) THEN
 
+#ifdef USE_OLD_SHAPIRO_FILTERS
+
+        IF ( tempStepping ) _EXCH_XYZ_R8( tFld,myThid )
+        IF ( saltStepping ) _EXCH_XYZ_R8( sFld,myThid )
+
+        DO bj=myByLo(myThid),myByHi(myThid)
+         DO bi=myBxLo(myThid),myBxHi(myThid)
+          DO k=1, Nr
+            IF ( tempStepping ) 
+     &       CALL SHAP_FILT_TRACEROLD( tFld,bi,bj,k,myTime,myThid )
+            IF ( saltStepping ) 
+     &       CALL SHAP_FILT_TRACEROLD( sFld,bi,bj,k,myTime,myThid )
+          ENDDO
+         ENDDO
+        ENDDO
+
+        IF ( tempStepping ) _EXCH_XYZ_R8( tFld,myThid )
+        IF ( saltStepping ) _EXCH_XYZ_R8( sFld,myThid )
+
+#else
+
         IF ( tempStepping .AND. nShapT.GT.0) THEN
           IF (Shap_funct.EQ.1) THEN
             CALL SHAP_FILT_TRACER_S1(
@@ -71,6 +91,7 @@
            STOP 'SHAP_FILT_APPLY: Ooops! Bad Shap_funct in T block'
           ENDIF
         ENDIF
+
         IF ( saltStepping .AND. nShapT.GT.0) THEN 
           IF (Shap_funct.EQ.1) THEN
             CALL SHAP_FILT_TRACER_S1(
@@ -93,8 +114,10 @@
           ENDIF
         ENDIF
 
-      ENDIF
 #endif /* USE_OLD_SHAPIRO_FILTERS */
+
+      ENDIF
+
 #endif /* ALLOW_SHAP_FILT */
 
       RETURN