Changeset 3175
- Timestamp:
- 2011-11-23T23:07:50+01:00 (12 years ago)
- Location:
- branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC
- Files:
-
- 4 edited
-
PISCES/trcsms_pisces.F90 (modified) (2 diffs)
-
trc.F90 (modified) (3 diffs)
-
trcstp.F90 (modified) (1 diff)
-
trcsub.F90 (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90
r3174 r3175 74 74 IF( nn_timing == 1 ) CALL timing_start('trc_sms_pisces') 75 75 ! 76 IF( kt == nittrc000 ) 77 IF( ln_ rsttr .AND. ln_pisdmp .AND. MOD( kt - 1, nn_pisdmp ) == 0 ) CALL trc_sms_pisces_dmp( kt ) ! Relaxation of some tracers78 76 IF( kt == nittrc000 ) CALL trc_sms_pisces_init ! Initialization (first time-step only) 77 IF( ln_pisdmp .AND. MOD( kt - nn_dttrc, nn_pisdmp ) == 0 ) CALL trc_sms_pisces_dmp( kt ) ! Relaxation of some tracers 78 CALL trc_sms_pisces_mass_conserv( kt ) 79 79 80 80 IF( ndayflxtr /= nday_year ) THEN ! New days … … 277 277 ENDIF 278 278 ENDIF 279 9500 FORMAT(i 4,e18.10)279 9500 FORMAT(i6,e18.10) 280 280 ! 281 281 END SUBROUTINE trc_sms_pisces_mass_conserv -
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trc.F90
r3116 r3175 79 79 !! additional 2D/3D outputs namelist 80 80 !! -------------------------------------------------- 81 REAL(wp) , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:, :) :: trc2d!: additional 2d outputs array82 REAL(wp) , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: trc3d!: additional 3d outputs array83 CHARACTER(len = 20), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc2d!: 2d field short name84 CHARACTER(len = 80), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc2l!: 2d field long name85 CHARACTER(len = 20), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc2u!: 2d field unit86 CHARACTER(len = 20), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc3d!: 3d field short name87 CHARACTER(len = 80), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc3l!: 3d field long name88 CHARACTER(len = 20), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc3u!: 3d field unit81 REAL(wp) , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:, :) :: trc2d !: additional 2d outputs array 82 REAL(wp) , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: trc3d !: additional 3d outputs array 83 CHARACTER(len = 20), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc2d !: 2d field short name 84 CHARACTER(len = 80), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc2l !: 2d field long name 85 CHARACTER(len = 20), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc2u !: 2d field unit 86 CHARACTER(len = 20), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc3d !: 3d field short name 87 CHARACTER(len = 80), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc3l !: 3d field long name 88 CHARACTER(len = 20), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: ctrc3u !: 3d field unit 89 89 LOGICAL , PUBLIC :: ln_diatrc !: boolean term for additional diagnostic 90 90 INTEGER , PUBLIC :: nn_writedia !: frequency of additional outputs … … 105 105 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: tsn_tm !: t/s average [m/s] 106 106 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: avt_tm !: vertical diffusivity coeff. at w-point [m2/s] 107 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: rhop_tm !: Density 107 108 # if defined key_zdfddm 108 109 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: avs_tm !: vertical double diffusivity coeff. at w-point [m/s] … … 162 163 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: tsn_temp 163 164 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: un_temp,vn_temp,wn_temp !: hold current values of avt, un, vn, wn 164 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: avt_temp !: hold current values of avt, un, vn, wn165 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: avt_temp, rhop_temp 165 166 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: e3t_temp,e3u_temp,e3v_temp,e3w_temp !: hold current values 166 167 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshn_temp, sshb_temp, ssha_temp, rnf_temp,h_rnf_temp -
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcstp.F90
r3174 r3175 98 98 END DO 99 99 IF( lwp ) WRITE(numstr,9300) kt, ztrai / areatot 100 9300 FORMAT(i 4,e18.10)100 9300 FORMAT(i6,e18.10) 101 101 ! 102 102 IF( nn_timing == 1 ) CALL timing_stop('trc_stp') -
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcsub.F90
r3160 r3175 91 91 tsn_tm (:,:,:,jp_tem) = tsn_tm (:,:,:,jp_tem) + tsn (:,:,:,jp_tem) * fse3t(:,:,:) 92 92 tsn_tm (:,:,:,jp_sal) = tsn_tm (:,:,:,jp_sal) + tsn (:,:,:,jp_sal) * fse3t(:,:,:) 93 rhop_tm (:,:,:) = rhop_tm (:,:,:) + rhop (:,:,:) * fse3t(:,:,:) 93 94 avt_tm (:,:,:) = avt_tm (:,:,:) + avt (:,:,:) * fse3w(:,:,:) 94 95 # if defined key_zdfddm … … 171 172 wn_temp (:,:,:) = wn (:,:,:) 172 173 tsn_temp (:,:,:,:) = tsn (:,:,:,:) 174 rhop_temp (:,:,:) = rhop (:,:,:) 173 175 avt_temp (:,:,:) = avt (:,:,:) 174 176 # if defined key_zdfddm … … 282 284 tsn_tm (:,:,:,jp_tem) = tsn_tm (:,:,:,jp_tem) + tsn (:,:,:,jp_tem) * e3t_temp(:,:,:) 283 285 tsn_tm (:,:,:,jp_sal) = tsn_tm (:,:,:,jp_sal) + tsn (:,:,:,jp_sal) * e3t_temp(:,:,:) 286 rhop_tm (:,:,:) = rhop_tm (:,:,:) + rhop (:,:,:) * e3t_temp(:,:,:) 284 287 avt_tm (:,:,:) = avt_tm (:,:,:) + avt (:,:,:) * e3w_temp(:,:,:) 285 288 # if defined key_zdfddm … … 371 374 tsn (ji,jj,jk,jp_tem) = tsn_tm (ji,jj,jk,jp_tem) * z1_ne3t 372 375 tsn (ji,jj,jk,jp_sal) = tsn_tm (ji,jj,jk,jp_sal) * z1_ne3t 376 rhop (ji,jj,jk) = rhop_tm (ji,jj,jk) * z1_ne3t 373 377 avt (ji,jj,jk) = avt_tm (ji,jj,jk) * z1_ne3w 374 378 # if defined key_zdfddm … … 467 471 CALL lbc_lnk( tsn (:,:,:,jp_tem), 'T', 1. ) 468 472 CALL lbc_lnk( tsn (:,:,:,jp_sal), 'T', 1. ) 473 CALL lbc_lnk( rhop (:,:,:) , 'T', 1. ) 469 474 CALL lbc_lnk( avt (:,:,:) , 'W', 1. ) 470 475 # if defined key_zdfddm 471 476 CALL lbc_lnk( avs (:,:,:) , 'W', 1. ) 472 477 # endif 473 478 #if defined key_ldfslp … … 572 577 tsn_tm (:,:,:,jp_tem) = tsn (:,:,:,jp_tem) * fse3t(:,:,:) 573 578 tsn_tm (:,:,:,jp_sal) = tsn (:,:,:,jp_sal) * fse3t(:,:,:) 579 rhop_tm (:,:,:) = rhop (:,:,:) * fse3t(:,:,:) 574 580 avt_tm (:,:,:) = avt (:,:,:) * fse3w(:,:,:) 575 581 # if defined key_zdfddm … … 672 678 wn (:,:,:) = wn_temp (:,:,:) 673 679 tsn (:,:,:,:) = tsn_temp (:,:,:,:) 680 rhop (:,:,:) = rhop_temp (:,:,:) 674 681 avt (:,:,:) = avt_temp (:,:,:) 675 682 # if defined key_zdfddm … … 793 800 tsn_tm (:,:,:,jp_tem) = tsn (:,:,:,jp_tem) * fse3t(:,:,:) 794 801 tsn_tm (:,:,:,jp_sal) = tsn (:,:,:,jp_sal) * fse3t(:,:,:) 802 rhop_tm (:,:,:) = rhop (:,:,:) * fse3t(:,:,:) 795 803 avt_tm (:,:,:) = avt (:,:,:) * fse3w(:,:,:) 796 804 # if defined key_zdfddm … … 1051 1059 & avs_tm(jpi,jpj,jpk) , avs_temp(jpi,jpj,jpk) , & 1052 1060 # endif 1061 & rhop_tm(jpi,jpj,jpk) , rhop_temp(jpi,jpj,jpk) , & 1053 1062 #if defined key_traldf_c3d 1054 1063 & ahtt_tm(jpi,jpj,jpk) , ahtt_temp(jpi,jpj,jpk), &
Note: See TracChangeset
for help on using the changeset viewer.
