Changeset 3641 for branches/2012/dev_r3604_LEGI8_TAM
- Timestamp:
- 2012-11-23T15:25:50+01:00 (12 years ago)
- Location:
- branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/nemogcm_tam.F90
r3612 r3641 87 87 USE tamctl 88 88 USE lib_mpp_tam 89 USE tamtrj90 !USE trj_tam89 !USE tamtrj 90 USE trj_tam 91 91 IMPLICIT NONE 92 92 PRIVATE … … 133 133 ! !== time stepping ==! 134 134 ! !-----------------------! 135 istp = nit000 136 CALL tam_tst 135 IF (ln_swi_opatam == 2) THEN 136 istp = nit000 - 1 137 CALL trj_rea( istp, 1) 138 istp = nit000 139 CALL istate_init_tan 140 DO istp = nit000, nitend, 1 141 CALL stp_tan( istp ) 142 END DO 143 IF (lwp) THEN 144 WRITE(numout,*) 145 WRITE(numout,*) ' tamtst: Finished testing operators' 146 WRITE(numout,*) ' ------' 147 WRITE(numout,*) 148 ENDIF 149 CALL flush(numout) 150 ELSE 151 CALL tam_tst 152 ENDIF 137 153 ! !------------------------! 138 154 ! !== finalize the run ==! … … 228 244 ENDIF 229 245 230 ! Now we know the dimensions of the grid and numout has been set we can 246 ! Now we know the dimensions of the grid and numout has been set we canhttp://forge.ipsl.jussieu.fr/nemo/changeset/3640 231 247 ! allocate arrays 232 248 CALL nemo_alloc() … … 380 396 CALL tam_trj_init 381 397 CALL tam_tst_init 382 !CALL tl_trj_ini398 CALL tl_trj_ini 383 399 END SUBROUTINE nemo_init_tam 384 400 -
branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/NEMO/OPATAM_SRC/step_tam.F90
r3611 r3641 78 78 79 79 indic = 0 ! reset to no error condition 80 !IF (kstp == nit000)CALL tl_trj_wri(nit000-1)80 IF ( kstp == nit000 ) CALL tl_trj_wri(nit000-1) 81 81 IF ( kstp /= nit000 ) CALL day_tam( kstp, 0 ) ! Calendar (day was already called at nit000 in day_init) 82 82 … … 203 203 ! N.B. ua, va, ta, sa arrays are used as workspace in this section 204 204 !----------------------------------------------------------------------- 205 !CALL tl_trj_wri(kstp)205 CALL tl_trj_wri( kstp ) 206 206 CALL trj_rea( kstp, 1) ! ... Read basic state trajectory at end of current step 207 207
Note: See TracChangeset
for help on using the changeset viewer.