/[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.5 by jmc, Sat Jun 26 01:15:30 2004 UTC revision 1.7 by jmc, Wed Apr 6 18:46:54 2005 UTC
# Line 40  C sFld                  :: input and fil Line 40  C sFld                  :: input and fil
40    
41  #ifdef ALLOW_SHAP_FILT  #ifdef ALLOW_SHAP_FILT
42    
43        LOGICAL  DIFFERENT_MULTIPLE        LOGICAL  DIFF_BASE_MULTIPLE
44        EXTERNAL DIFFERENT_MULTIPLE        EXTERNAL DIFF_BASE_MULTIPLE
45    
46  C !LOCAL VARIABLES: ====================================================  C !LOCAL VARIABLES: ====================================================
47  C     == Local variables ==  C     == Local variables ==
# Line 101  C-----    Diagnostic of Shapiro Filter e Line 101  C-----    Diagnostic of Shapiro Filter e
101  C         Note: Shap_tmpFld1 from shap_filt_tracer_s2 (and not s1, s4)  C         Note: Shap_tmpFld1 from shap_filt_tracer_s2 (and not s1, s4)
102  C               is directly proportional to Delta-Tr due to the Filter  C               is directly proportional to Delta-Tr due to the Filter
103            IF ( Shap_funct.NE.1 .AND. Shap_funct.NE.4 .AND.            IF ( Shap_funct.NE.1 .AND. Shap_funct.NE.4 .AND.
104       &     DIFFERENT_MULTIPLE(Shap_diagFreq,myTime,myTime-deltaTClock)       &     DIFF_BASE_MULTIPLE(baseTime,Shap_diagFreq,myTime,deltaTClock)
105       &       ) THEN       &       ) THEN
106             _BARRIER             _BARRIER
107             _BEGIN_MASTER( myThid )             _BEGIN_MASTER( myThid )
# Line 112  C               is directly proportional Line 112  C               is directly proportional
112             _BARRIER             _BARRIER
113            ENDIF            ENDIF
114    
115    #ifdef ALLOW_DIAGNOSTICS
116              IF ( Shap_funct.NE.1 .AND. Shap_funct.NE.4
117         &                         .AND. useDiagnostics ) THEN
118                CALL DIAGNOSTICS_FILL(Shap_tmpFld1,'SHAP_dT ',0,Nr,
119         &                                                  0,1,1,myThid)
120              ENDIF
121    #endif /* ALLOW_DIAGNOSTICS */
122    
123          ENDIF          ENDIF
124    
125          IF ( saltStepping .AND. nShapS.GT.0) THEN          IF ( saltStepping .AND. nShapS.GT.0) THEN
# Line 139  C-----    Diagnostic of Shapiro Filter e Line 147  C-----    Diagnostic of Shapiro Filter e
147  C         Note: Shap_tmpFld1 from shap_filt_tracer_s2 (and not s1, s4)  C         Note: Shap_tmpFld1 from shap_filt_tracer_s2 (and not s1, s4)
148  C               is directly proportional to Delta-Tr due to the Filter  C               is directly proportional to Delta-Tr due to the Filter
149            IF ( Shap_funct.NE.1 .AND. Shap_funct.NE.4 .AND.            IF ( Shap_funct.NE.1 .AND. Shap_funct.NE.4 .AND.
150       &     DIFFERENT_MULTIPLE(Shap_diagFreq,myTime,myTime-deltaTClock)       &     DIFF_BASE_MULTIPLE(baseTime,Shap_diagFreq,myTime,deltaTClock)
151       &       ) THEN       &       ) THEN
152             _BARRIER             _BARRIER
153             _BEGIN_MASTER( myThid )             _BEGIN_MASTER( myThid )
# Line 150  C               is directly proportional Line 158  C               is directly proportional
158             _BARRIER             _BARRIER
159            ENDIF            ENDIF
160    
161    #ifdef ALLOW_DIAGNOSTICS
162              IF ( Shap_funct.NE.1 .AND. Shap_funct.NE.4
163         &                         .AND. useDiagnostics ) THEN
164                CALL DIAGNOSTICS_FILL(Shap_tmpFld1,'SHAP_dS ',0,Nr,
165         &                                                  0,1,1,myThid)
166              ENDIF
167    #endif /* ALLOW_DIAGNOSTICS */
168    
169          ENDIF          ENDIF
170    
171  #endif /* USE_OLD_SHAPIRO_FILTERS */  #endif /* USE_OLD_SHAPIRO_FILTERS */
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.7
  ViewVC Help
Powered by ViewVC 1.1.22