Changeset 2370 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/step.F90
- Timestamp:
- 2010-11-10T08:48:54+01:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/step.F90
r2348 r2370 26 26 27 27 !!---------------------------------------------------------------------- 28 !! stp : OPA system time-stepping28 !! stp : OPA system time-stepping 29 29 !!---------------------------------------------------------------------- 30 30 USE step_oce ! time stepping definition modules 31 31 #if defined key_top 32 USE trcstp ! passive tracer time-stepping (trc_stp routine)33 #endif 34 USE asminc ! assimilation increments (tra_asm_inc, dyn_asm_inc routines)35 USE stpctl ! time stepping control (stp_ctl routine)36 USE restart ! ocean restart (rst_wri routine)37 USE prtctl ! Print control (prt_ctl routine)32 USE trcstp ! passive tracer time-stepping (trc_stp routine) 33 #endif 34 USE asminc ! assimilation increments (tra_asm_inc, dyn_asm_inc routines) 35 USE stpctl ! time stepping control (stp_ctl routine) 36 USE restart ! ocean restart (rst_wri routine) 37 USE prtctl ! Print control (prt_ctl routine) 38 38 39 39 #if defined key_agrif … … 44 44 PRIVATE 45 45 46 PUBLIC stp 46 PUBLIC stp ! called by opa.F90 47 47 48 48 !! * Substitutions … … 52 52 !! NEMO/OPA 3.3 , NEMO Consortium (2010) 53 53 !! $Id$ 54 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 55 !!---------------------------------------------------------------------- 56 54 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 55 !!---------------------------------------------------------------------- 57 56 CONTAINS 58 57 … … 149 148 IF( ln_zps ) CALL zps_hde( kstp, jpts, tsb, gtsu, gtsv, & ! Partial steps: before horizontal gradient 150 149 & rhd, gru , grv ) ! of t, s, rd at the last ocean level 151 IF ( .NOT. ln_traldf_grif ) THEN152 CALL ldf_slp ( kstp, rhd, rn2b ) ! before slope of the lateral mixing150 IF( ln_traldf_grif ) THEN ! before slope for Griffies operator 151 CALL ldf_slp_grif( kstp ) 153 152 ELSE 154 CALL ldf_slp_grif( kstp ) 155 IF ( ln_dynldf_bilap .OR. ln_dynldf_iso ) CALL ldf_slp( kstp, rhd, rn2b ) 156 ENDIF 153 CALL ldf_slp( kstp, rhd, rn2b ) ! before slope for Madec operator 154 ENDIF 157 155 ENDIF 158 156 #if defined key_traldf_c2d
Note: See TracChangeset
for help on using the changeset viewer.