/[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.8 by jmc, Sun May 15 03:04:57 2005 UTC revision 1.9 by jmc, Tue Sep 27 22:11:06 2005 UTC
# Line 63  CEOP Line 63  CEOP
63          DO bj=myByLo(myThid),myByHi(myThid)          DO bj=myByLo(myThid),myByHi(myThid)
64           DO bi=myBxLo(myThid),myBxHi(myThid)           DO bi=myBxLo(myThid),myBxHi(myThid)
65            DO k=1, Nr            DO k=1, Nr
66              IF ( tempStepping )              IF ( tempStepping )
67       &       CALL SHAP_FILT_TRACEROLD( tFld,bi,bj,k,myTime,myThid )       &       CALL SHAP_FILT_TRACEROLD( tFld,bi,bj,k,myTime,myThid )
68              IF ( saltStepping )              IF ( saltStepping )
69       &       CALL SHAP_FILT_TRACEROLD( sFld,bi,bj,k,myTime,myThid )       &       CALL SHAP_FILT_TRACEROLD( sFld,bi,bj,k,myTime,myThid )
70            ENDDO            ENDDO
71           ENDDO           ENDDO
# Line 81  CEOP Line 81  CEOP
81              CALL SHAP_FILT_TRACER_S1(              CALL SHAP_FILT_TRACER_S1(
82       U           tFld, Shap_tmpFld1,       U           tFld, Shap_tmpFld1,
83       I           nShapT, 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.20
85         &                            .OR. Shap_funct.EQ.21) THEN
86              CALL SHAP_FILT_TRACER_S2(              CALL SHAP_FILT_TRACER_S2(
87       U           tFld, Shap_tmpFld1,       U           tFld, Shap_tmpFld1,
88       I           nShapT, Nr, myTime, myThid )       I           nShapT, Nr, myTime, myThid )
# Line 89  CEOP Line 90  CEOP
90              CALL SHAP_FILT_TRACER_S4(              CALL SHAP_FILT_TRACER_S4(
91       U           tFld, Shap_tmpFld1,       U           tFld, Shap_tmpFld1,
92       I           nShapT, Nr, myTime, myThid )       I           nShapT, Nr, myTime, myThid )
93            ELSEIF (Shap_funct.EQ.20) THEN  c         ELSEIF (Shap_funct.EQ.20) THEN
94              CALL SHAP_FILT_TRACER_S2G(  c           CALL SHAP_FILT_TRACER_S2G(
95       U           tFld, Shap_tmpFld1,  c    U           tFld, Shap_tmpFld1,
96       I           nShapT, Nr, myTime, myThid )  c    I           nShapT, Nr, myTime, myThid )
97            ELSE            ELSE
98             STOP 'SHAP_FILT_APPLY_TS: Ooops! Bad Shap_funct in T block'             STOP 'SHAP_FILT_APPLY_TS: Ooops! Bad Shap_funct in T block'
99            ENDIF            ENDIF
# Line 122  C               is directly proportional Line 123  C               is directly proportional
123    
124          ENDIF          ENDIF
125    
126          IF ( saltStepping .AND. nShapS.GT.0) THEN          IF ( saltStepping .AND. nShapS.GT.0) THEN
127            IF (Shap_funct.EQ.1) THEN            IF (Shap_funct.EQ.1) THEN
128              CALL SHAP_FILT_TRACER_S1(              CALL SHAP_FILT_TRACER_S1(
129       U           sFld, Shap_tmpFld1,       U           sFld, Shap_tmpFld1,
130       I           nShapS, Nr, myTime, myThid )       I           nShapS, Nr, myTime, myThid )
131            ELSEIF (Shap_funct.EQ.2 .OR. Shap_funct.EQ.21) THEN            ELSEIF (Shap_funct.EQ.2 .OR. Shap_funct.EQ.20
132         &                            .OR. Shap_funct.EQ.21) THEN
133              CALL SHAP_FILT_TRACER_S2(              CALL SHAP_FILT_TRACER_S2(
134       U           sFld, Shap_tmpFld1,       U           sFld, Shap_tmpFld1,
135       I           nShapS, Nr, myTime, myThid )       I           nShapS, Nr, myTime, myThid )
# Line 135  C               is directly proportional Line 137  C               is directly proportional
137              CALL SHAP_FILT_TRACER_S4(              CALL SHAP_FILT_TRACER_S4(
138       U           sFld, Shap_tmpFld1,       U           sFld, Shap_tmpFld1,
139       I           nShapS, Nr, myTime, myThid )       I           nShapS, Nr, myTime, myThid )
140            ELSEIF (Shap_funct.EQ.20) THEN  c         ELSEIF (Shap_funct.EQ.20) THEN
141              CALL SHAP_FILT_TRACER_S2G(  c           CALL SHAP_FILT_TRACER_S2G(
142       U           sFld, Shap_tmpFld1,  c    U           sFld, Shap_tmpFld1,
143       I           nShapS, Nr, myTime, myThid )  c    I           nShapS, Nr, myTime, myThid )
144            ELSE            ELSE
145             STOP 'SHAP_FILT_APPLY_TS: Ooops! Bad Shap_funct in S block'             STOP 'SHAP_FILT_APPLY_TS: Ooops! Bad Shap_funct in S block'
146            ENDIF            ENDIF

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9

  ViewVC Help
Powered by ViewVC 1.1.22