--- MITgcm/pkg/shap_filt/shap_filt_apply_ts.F	2003/08/03 03:12:36	1.4
+++ MITgcm/pkg/shap_filt/shap_filt_apply_ts.F	2004/06/26 01:15:30	1.5
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/shap_filt/shap_filt_apply_ts.F,v 1.4 2003/08/03 03:12:36 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/shap_filt/shap_filt_apply_ts.F,v 1.5 2004/06/26 01:15:30 jmc Exp $
 C $Name:  $
 
 #include "SHAP_FILT_OPTIONS.h"
@@ -53,7 +53,7 @@
 
 CEOP
 
-      IF (nShapT.GT.0) THEN
+      IF (nShapT.GT.0 .OR. nShapS.GT.0) THEN
 
 #ifdef USE_OLD_SHAPIRO_FILTERS
 
@@ -80,19 +80,19 @@
           IF (Shap_funct.EQ.1) THEN
             CALL SHAP_FILT_TRACER_S1(
      U           tFld, Shap_tmpFld1,
-     I           Nr, myTime, myThid )
+     I           nShapT, Nr, myTime, myThid )
           ELSEIF (Shap_funct.EQ.2 .OR. Shap_funct.EQ.21) THEN
             CALL SHAP_FILT_TRACER_S2(
      U           tFld, Shap_tmpFld1,
-     I           Nr, myTime, myThid )
+     I           nShapT, Nr, myTime, myThid )
           ELSEIF (Shap_funct.EQ.4) THEN
             CALL SHAP_FILT_TRACER_S4(
      U           tFld, Shap_tmpFld1,
-     I           Nr, myTime, myThid )
+     I           nShapT, Nr, myTime, myThid )
           ELSEIF (Shap_funct.EQ.20) THEN
             CALL SHAP_FILT_TRACER_S2G(
      U           tFld, Shap_tmpFld1,
-     I           Nr, myTime, myThid )
+     I           nShapT, Nr, myTime, myThid )
           ELSE
            STOP 'SHAP_FILT_APPLY_TS: Ooops! Bad Shap_funct in T block'
           ENDIF
@@ -114,23 +114,23 @@
 
         ENDIF
 
-        IF ( saltStepping .AND. nShapT.GT.0) THEN 
+        IF ( saltStepping .AND. nShapS.GT.0) THEN 
           IF (Shap_funct.EQ.1) THEN
             CALL SHAP_FILT_TRACER_S1(
      U           sFld, Shap_tmpFld1,
-     I           Nr, myTime, myThid )
+     I           nShapS, Nr, myTime, myThid )
           ELSEIF (Shap_funct.EQ.2 .OR. Shap_funct.EQ.21) THEN
             CALL SHAP_FILT_TRACER_S2(
      U           sFld, Shap_tmpFld1,
-     I           Nr, myTime, myThid )
+     I           nShapS, Nr, myTime, myThid )
           ELSEIF (Shap_funct.EQ.4) THEN
             CALL SHAP_FILT_TRACER_S4(
      U           sFld, Shap_tmpFld1,
-     I           Nr, myTime, myThid )
+     I           nShapS, Nr, myTime, myThid )
           ELSEIF (Shap_funct.EQ.20) THEN
             CALL SHAP_FILT_TRACER_S2G(
      U           sFld, Shap_tmpFld1,
-     I           Nr, myTime, myThid )
+     I           nShapS, Nr, myTime, myThid )
           ELSE
            STOP 'SHAP_FILT_APPLY_TS: Ooops! Bad Shap_funct in S block'
           ENDIF