Changeset 6213 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO
- Timestamp:
- 2016-01-05T16:54:40+01:00 (8 years ago)
- Location:
- branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC
- Files:
-
- 3 edited
-
CFC/trcsms_cfc.F90 (modified) (2 diffs)
-
IDTRA/trcsms_idtra.F90 (modified) (4 diffs)
-
trcrst.F90 (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90
r6201 r6213 205 205 ENDIF 206 206 ! 207 IF( lrst_trc ) THEN208 IF(lwp) WRITE(numout,*)209 IF(lwp) WRITE(numout,*) 'trc_sms_cfc : cumulated input function fields written in ocean restart file ', &210 & 'at it= ', kt,' date= ', ndastp211 IF(lwp) WRITE(numout,*) '~~~~'212 DO jn = jp_cfc0, jp_cfc1213 CALL iom_rstput( kt, nitrst, numrtw, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) )214 END DO215 ENDIF207 !IF( lrst_trc ) THEN 208 ! IF(lwp) WRITE(numout,*) 209 ! IF(lwp) WRITE(numout,*) 'trc_sms_cfc : cumulated input function fields written in ocean restart file ', & 210 ! & 'at it= ', kt,' date= ', ndastp 211 ! IF(lwp) WRITE(numout,*) '~~~~' 212 ! DO jn = jp_cfc0, jp_cfc1 213 ! CALL iom_rstput( kt, nitrst, numrtw, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) ) 214 ! END DO 215 !ENDIF 216 216 ! 217 217 IF( lk_iomput ) THEN … … 282 282 sca(4,2) = -0.067430 283 283 284 IF( ln_rsttr ) THEN285 IF(lwp) WRITE(numout,*)286 IF(lwp) WRITE(numout,*) ' Read specific variables from CFC model '287 IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~~~~'288 !289 DO jn = jp_cfc0, jp_cfc1290 CALL iom_get( numrtr, jpdom_autoglo, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) )291 END DO292 ENDIF284 !IF( ln_rsttr ) THEN 285 ! IF(lwp) WRITE(numout,*) 286 ! IF(lwp) WRITE(numout,*) ' Read specific variables from CFC model ' 287 ! IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~~~~' 288 ! ! 289 ! DO jn = jp_cfc0, jp_cfc1 290 ! CALL iom_get( numrtr, jpdom_autoglo, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) ) 291 ! END DO 292 !ENDIF 293 293 IF(lwp) WRITE(numout,*) 294 294 ! -
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/IDTRA/trcsms_idtra.F90
r6207 r6213 88 88 CALL flush(numout) 89 89 # endif 90 CALL idtra_init90 ! CALL idtra_init 91 91 ENDIF 92 92 … … 138 138 ! 139 139 !! restart and diagnostics management -- 140 IF( lrst_trc ) THEN141 IF(lwp) WRITE(numout,*)142 IF(lwp) WRITE(numout,*) 'trc_sms_idtra : cumulated input function fields written in ocean restart file ', &143 & 'at it= ', kt,' date= ', ndastp144 IF(lwp) WRITE(numout,*) '~~~~'145 !!DO jn = jp_idtra0, jp_idtra1146 CALL iom_rstput( kt, nitrst, numrtw, 'qint_IDTRA', qint_idtra(:,:,1) )147 !!END DO148 #if defined key_debug_medusa149 IF(lwp) WRITE(numout,*) ' IDTRA - writing diag-restart - DONE trc_sms_idtra -- '150 CALL flush(numout)151 #endif152 ENDIF140 !IF( lrst_trc ) THEN 141 ! IF(lwp) WRITE(numout,*) 142 ! IF(lwp) WRITE(numout,*) 'trc_sms_idtra : cumulated input function fields written in ocean restart file ', & 143 ! & 'at it= ', kt,' date= ', ndastp 144 ! IF(lwp) WRITE(numout,*) '~~~~' 145 ! !!DO jn = jp_idtra0, jp_idtra1 146 ! CALL iom_rstput( kt, nitrst, numrtw, 'qint_IDTRA', qint_idtra(:,:,1) ) 147 ! !!END DO 148 ! if defined key_debug_medusa 149 ! IF(lwp) WRITE(numout,*) ' IDTRA - writing diag-restart - DONE trc_sms_idtra -- ' 150 ! CALL flush(numout) 151 ! endif 152 !ENDIF 153 153 ! 154 154 IF( lk_iomput ) THEN … … 171 171 IF( l_trdtrc ) THEN 172 172 # if defined key_debug_medusa 173 IF(lwp) WRITE(numout,*) ' IDTRA - writing trends - trc_sms_idtra -- '174 CALL flush(numout)173 IF(lwp) WRITE(numout,*) ' IDTRA - writing trends - trc_sms_idtra -- ' 174 CALL flush(numout) 175 175 # endif 176 176 DO jn = jp_idtra0, jp_idtra1 … … 178 178 END DO 179 179 # if defined key_debug_medusa 180 IF(lwp) WRITE(numout,*) ' IDTRA - writing trends - DONE trc_sms_idtra -- '181 CALL flush(numout)180 IF(lwp) WRITE(numout,*) ' IDTRA - writing trends - DONE trc_sms_idtra -- ' 181 CALL flush(numout) 182 182 # endif 183 183 END IF 184 184 ! 185 # if defined key_debug_medusa 186 IF(lwp) WRITE(numout,*) ' IDTRA - Check: nn_timing = ', nn_timing 187 CALL flush(numout) 188 # endif 185 189 IF( nn_timing == 1 ) CALL timing_stop('trc_sms_idtra') 186 190 ! -
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90
r6201 r6213 33 33 USE trcsms_medusa 34 34 !! 35 #if defined key_idtra 36 USE trcsms_idtra 37 #endif 38 !! 39 #if defined key_cfc 40 USE trcsms_cfc 41 #endif 35 42 IMPLICIT NONE 36 43 PRIVATE … … 268 275 fq2 = SUM(zn_dms_din(:,:)) 269 276 if (lwp) write (numout,'(a,3f15.5)') 'DMS, DIN ', fq0, fq1, fq2 270 271 #endif 272 277 #endif 278 ! 279 #if defined key_idtra 280 !! JPALM -- 05-01-2016 -- mv idtra and CFC restart reading and 281 !! writting here undre their key. 282 !! problems in CFC restart, maybe because of this... 283 !! and pb in idtra diag or diad-restart writing. 284 !!---------------------------------------------------------------------- 285 IF( iom_varid( numrtr, 'qint_idtra', ldstop = .FALSE. ) > 0 ) THEN 286 !! YES; in which case read them 287 !! 288 IF(lwp) WRITE(numout,*) ' IDTRA averaged properties present - reading in ...' 289 CALL iom_get( numrtr, jpdom_autoglo, 'qint_IDTRA', qint_idtra(:,:,1) ) 290 ELSE 291 !! NO; in which case set them to zero 292 !! 293 IF(lwp) WRITE(numout,*) ' IDTRA averaged properties absent - setting to zero ...' 294 qint_idtra(:,:,1) = 0.0 !! CHN 295 ENDIF 296 !! 297 !! calculate stats on these fields 298 IF(lwp) WRITE(numout,*) ' IDTRA averaged properties stats (min, max, sum) ...' 299 fq0 = MINVAL(qint_idtra(:,:,1)) 300 fq1 = MAXVAL(qint_idtra(:,:,1)) 301 fq2 = SUM(qint_idtra(:,:,1)) 302 if (lwp) write (numout,'(a,3f15.5)') 'qint_idtra ', fq0, fq1, fq2 303 #endif 304 ! 305 #if defined key_cfc 306 DO jn = jp_cfc0, jp_cfc1 307 IF( iom_varid( numrtr, 'qint_'//ctrcnm(jn), ldstop = .FALSE. ) > 0 ) THEN 308 !! YES; in which case read them 309 !! 310 IF(lwp) WRITE(numout,*) ' CFC averaged properties present - reading in ...' 311 CALL iom_get( numrtr, jpdom_autoglo, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) ) 312 ELSE 313 !! NO; in which case set them to zero 314 !! 315 IF(lwp) WRITE(numout,*) ' CFC averaged properties absent - setting to zero ...' 316 qint_cfc(:,:,jn) = 0.0 !! CHN 317 ENDIF 318 !! 319 !! calculate stats on these fields 320 IF(lwp) WRITE(numout,*) ' CFC averaged properties stats (min, max, sum) ...' 321 fq0 = MINVAL(qint_cfc(:,:,jn)) 322 fq1 = MAXVAL(qint_cfc(:,:,jn)) 323 fq2 = SUM(qint_cfc(:,:,jn)) 324 if (lwp) write (numout,'(a,3f15.5)') 'qint_'//ctrcnm(jn), fq0, fq1, fq2 325 END DO 326 #endif 273 327 ! 274 328 END SUBROUTINE trc_rst_read … … 390 444 !! 391 445 #endif 392 393 ! 446 ! 447 #if defined key_idtra 448 !! JPALM -- 05-01-2016 -- mv idtra and CFC restart reading and 449 !! writting here undre their key. 450 !! problems in CFC restart, maybe because of this... 451 !! and pb in idtra diag or diad-restart writing. 452 !!---------------------------------------------------------------------- 453 IF(lwp) WRITE(numout,*) ' IDTRA averaged properties - writing out ...' 454 CALL iom_rstput( kt, nitrst, numrtw, 'qint_IDTRA', qint_idtra(:,:,1) ) 455 !! 456 !! calculate stats on these fields 457 IF(lwp) WRITE(numout,*) ' IDTRA averaged properties stats (min, max, sum) ...' 458 fq0 = MINVAL(qint_idtra(:,:,1)) 459 fq1 = MAXVAL(qint_idtra(:,:,1)) 460 fq2 = SUM(qint_idtra(:,:,1)) 461 if (lwp) write (numout,'(a,3f15.5)') 'qint_idtra ', fq0, fq1, fq2 462 #endif 463 ! 464 #if defined key_cfc 465 DO jn = jp_cfc0, jp_cfc1 466 IF(lwp) WRITE(numout,*) ' CFC averaged properties - writing out ...' 467 CALL iom_rstput( kt, nitrst, numrtw, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) ) 468 !! 469 !! calculate stats on these fields 470 IF(lwp) WRITE(numout,*) ' CFC averaged properties stats (min, max, sum) ...' 471 fq0 = MINVAL(qint_cfc(:,:,jn)) 472 fq1 = MAXVAL(qint_cfc(:,:,jn)) 473 fq2 = SUM(qint_cfc(:,:,jn)) 474 if (lwp) write (numout,'(a,3f15.5)') 'qint_'//ctrcnm(jn), fq0, fq1, fq2 475 END DO 476 #endif 477 ! 478 394 479 IF( kt == nitrst ) THEN 395 480 CALL trc_rst_stat ! statistics
Note: See TracChangeset
for help on using the changeset viewer.
