/[MITgcm]/MITgcm/pkg/shap_filt/shap_filt_apply_ts.F
ViewVC logotype

Diff of /MITgcm/pkg/shap_filt/shap_filt_apply_ts.F

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.4 by jmc, Sun Aug 3 03:12:36 2003 UTC revision 1.5 by jmc, Sat Jun 26 01:15:30 2004 UTC
# Line 53  C     bi,bj,k :: loop index Line 53  C     bi,bj,k :: loop index
53    
54  CEOP  CEOP
55    
56        IF (nShapT.GT.0) THEN        IF (nShapT.GT.0 .OR. nShapS.GT.0) THEN
57    
58  #ifdef USE_OLD_SHAPIRO_FILTERS  #ifdef USE_OLD_SHAPIRO_FILTERS
59    
# Line 80  CEOP Line 80  CEOP
80            IF (Shap_funct.EQ.1) THEN            IF (Shap_funct.EQ.1) THEN
81              CALL SHAP_FILT_TRACER_S1(              CALL SHAP_FILT_TRACER_S1(
82       U           tFld, Shap_tmpFld1,       U           tFld, Shap_tmpFld1,
83       I           Nr, myTime, myThid )       I           nShapT, Nr, myTime, myThid )
84            ELSEIF (Shap_funct.EQ.2 .OR. Shap_funct.EQ.21) THEN            ELSEIF (Shap_funct.EQ.2 .OR. Shap_funct.EQ.21) THEN
85              CALL SHAP_FILT_TRACER_S2(              CALL SHAP_FILT_TRACER_S2(
86       U           tFld, Shap_tmpFld1,       U           tFld, Shap_tmpFld1,
87       I           Nr, myTime, myThid )       I           nShapT, Nr, myTime, myThid )
88            ELSEIF (Shap_funct.EQ.4) THEN            ELSEIF (Shap_funct.EQ.4) THEN
89              CALL SHAP_FILT_TRACER_S4(              CALL SHAP_FILT_TRACER_S4(
90       U           tFld, Shap_tmpFld1,       U           tFld, Shap_tmpFld1,
91       I           Nr, myTime, myThid )       I           nShapT, Nr, myTime, myThid )
92            ELSEIF (Shap_funct.EQ.20) THEN            ELSEIF (Shap_funct.EQ.20) THEN
93              CALL SHAP_FILT_TRACER_S2G(              CALL SHAP_FILT_TRACER_S2G(
94       U           tFld, Shap_tmpFld1,       U           tFld, Shap_tmpFld1,
95       I           Nr, myTime, myThid )       I           nShapT, Nr, myTime, myThid )
96            ELSE            ELSE
97             STOP 'SHAP_FILT_APPLY_TS: Ooops! Bad Shap_funct in T block'             STOP 'SHAP_FILT_APPLY_TS: Ooops! Bad Shap_funct in T block'
98            ENDIF            ENDIF
# Line 114  C               is directly proportional Line 114  C               is directly proportional
114    
115          ENDIF          ENDIF
116    
117          IF ( saltStepping .AND. nShapT.GT.0) THEN          IF ( saltStepping .AND. nShapS.GT.0) THEN
118            IF (Shap_funct.EQ.1) THEN            IF (Shap_funct.EQ.1) THEN
119              CALL SHAP_FILT_TRACER_S1(              CALL SHAP_FILT_TRACER_S1(
120       U           sFld, Shap_tmpFld1,       U           sFld, Shap_tmpFld1,
121       I           Nr, myTime, myThid )       I           nShapS, Nr, myTime, myThid )
122            ELSEIF (Shap_funct.EQ.2 .OR. Shap_funct.EQ.21) THEN            ELSEIF (Shap_funct.EQ.2 .OR. Shap_funct.EQ.21) THEN
123              CALL SHAP_FILT_TRACER_S2(              CALL SHAP_FILT_TRACER_S2(
124       U           sFld, Shap_tmpFld1,       U           sFld, Shap_tmpFld1,
125       I           Nr, myTime, myThid )       I           nShapS, Nr, myTime, myThid )
126            ELSEIF (Shap_funct.EQ.4) THEN            ELSEIF (Shap_funct.EQ.4) THEN
127              CALL SHAP_FILT_TRACER_S4(              CALL SHAP_FILT_TRACER_S4(
128       U           sFld, Shap_tmpFld1,       U           sFld, Shap_tmpFld1,
129       I           Nr, myTime, myThid )       I           nShapS, Nr, myTime, myThid )
130            ELSEIF (Shap_funct.EQ.20) THEN            ELSEIF (Shap_funct.EQ.20) THEN
131              CALL SHAP_FILT_TRACER_S2G(              CALL SHAP_FILT_TRACER_S2G(
132       U           sFld, Shap_tmpFld1,       U           sFld, Shap_tmpFld1,
133       I           Nr, myTime, myThid )       I           nShapS, Nr, myTime, myThid )
134            ELSE            ELSE
135             STOP 'SHAP_FILT_APPLY_TS: Ooops! Bad Shap_funct in S block'             STOP 'SHAP_FILT_APPLY_TS: Ooops! Bad Shap_funct in S block'
136            ENDIF            ENDIF
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5
  ViewVC Help
Powered by ViewVC 1.1.22