Changeset 6030
- Timestamp:
- 2015-12-10T17:12:15+01:00 (8 years ago)
- Location:
- branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg
r6004 r6030 92 92 nn_fwb = 0 ! FreshWater Budget: =0 unchecked 93 93 ln_apr_dyn = .false. ! Patm gradient added in ocean & ice Eqs. (T => fill namsbc_apr ) 94 ln_traqsr = .false. ! Light penetration (T) or not (F) 94 95 95 96 / … … 129 130 &namtra_qsr ! penetrative solar radiation 130 131 !----------------------------------------------------------------------- 131 ln_traqsr = .false. ! Light penetration (T) or not (F)132 132 nn_chldta = 0 ! RGB : Chl data (=1) or cst value (=0) 133 133 / -
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
r6004 r6030 106 106 USE oce, ONLY: zts => tsa 107 107 USE oce, ONLY: zuslp => ua , zvslp => va 108 USE oce, ONLY: zwslpi => ua_sv , zwslpj => va_sv109 108 USE oce, ONLY: zu => ub , zv => vb, zw => rke 110 109 ! 111 110 INTEGER, INTENT(in) :: kt ! ocean time-step index 112 111 ! 112 REAL(wp), DIMENSION(jpi,jpj,jpk ) :: zwslpi, zwslpj 113 113 ! REAL(wp), DIMENSION(jpi,jpj,jpk,jpts) :: zts 114 114 ! REAL(wp), DIMENSION(jpi,jpj,jpk ) :: zuslp, zvslp, zwslpi, zwslpj -
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90
r6004 r6030 323 323 ENDIF 324 324 ! 325 un_b(:,:) = e3u_a(:,:, jk) * un(:,:,1) * umask(:,:,1)326 ub_b(:,:) = e3u_b(:,:, jk) * ub(:,:,1) * umask(:,:,1)327 vn_b(:,:) = e3v_a(:,:, jk) * vn(:,:,1) * vmask(:,:,1)328 vb_b(:,:) = e3v_b(:,:, jk) * vb(:,:,1) * vmask(:,:,1)325 un_b(:,:) = e3u_a(:,:,1) * un(:,:,1) * umask(:,:,1) 326 ub_b(:,:) = e3u_b(:,:,1) * ub(:,:,1) * umask(:,:,1) 327 vn_b(:,:) = e3v_a(:,:,1) * vn(:,:,1) * vmask(:,:,1) 328 vb_b(:,:) = e3v_b(:,:,1) * vb(:,:,1) * vmask(:,:,1) 329 329 DO jk = 2, jpkm1 330 330 un_b(:,:) = un_b(:,:) + e3u_a(:,:,jk) * un(:,:,jk) * umask(ji,jj,jk) -
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90
r6004 r6030 4 4 !! Initialization of tidal forcing 5 5 !!====================================================================== 6 !! History : 9.0 ! 2007 (O. Le Galloudec) Original code6 !! History : 9.0 ! 07 (O. Le Galloudec) Original code 7 7 !!---------------------------------------------------------------------- 8 8 #if defined key_tide … … 10 10 !! 'key_tide' : tidal potential 11 11 !!---------------------------------------------------------------------- 12 !! upd_tide : update tidal potential12 !! upd_tide : update tidal potential 13 13 !!---------------------------------------------------------------------- 14 USE oce ! ocean dynamics and tracers variables15 USE dom_oce ! ocean space and time domain16 USE in_out_manager ! I/O units17 USE phycst ! physical constant18 USE sbctide ! tide potential variable19 USE tideini , ONLY:ln_tide_ramp, rdttideramp14 USE oce ! ocean dynamics and tracers variables 15 USE dom_oce ! ocean space and time domain 16 USE in_out_manager ! I/O units 17 USE phycst ! physical constant 18 USE sbctide ! tide potential variable 19 USE tideini, ONLY: ln_tide_ramp, rdttideramp 20 20 21 21 IMPLICIT NONE … … 31 31 CONTAINS 32 32 33 SUBROUTINE upd_tide( kt, kit, kbaro, koffset )33 SUBROUTINE upd_tide( kt, kit, time_offset ) 34 34 !!---------------------------------------------------------------------- 35 35 !! *** ROUTINE upd_tide *** … … 42 42 !!---------------------------------------------------------------------- 43 43 INTEGER, INTENT(in) :: kt ! ocean time-step index 44 INTEGER, INTENT(in), OPTIONAL :: kit ! external mode sub-time-step index (lk_dynspg_ts=T only)45 INTEGER, INTENT(in), OPTIONAL :: kbaro ! number of sub-time-step (lk_dynspg_ts=T only)46 INTEGER, INTENT(in), OPTIONAL :: koffset ! time offset in number47 ! ! of sub-time-steps (lk_dynspg_ts=T only)44 INTEGER, INTENT(in), OPTIONAL :: kit ! external mode sub-time-step index (lk_dynspg_ts=T) 45 INTEGER, INTENT(in), OPTIONAL :: time_offset ! time offset in number 46 ! of internal steps (lk_dynspg_ts=F) 47 ! of external steps (lk_dynspg_ts=T) 48 48 ! 49 49 INTEGER :: joffset ! local integer … … 57 57 ! 58 58 joffset = 0 59 IF( PRESENT( koffset ) ) joffset = koffset59 IF( PRESENT( time_offset ) ) joffset = time_offset 60 60 ! 61 IF( PRESENT( kit ) .AND. PRESENT( kbaro )) THEN62 zt = zt + ( kit + 0.5_wp * ( joffset - 1 ) ) * rdt / REAL( kbaro, wp )61 IF( PRESENT( kit ) ) THEN 62 zt = zt + ( kit + joffset - 1 ) * rdt / REAL( nn_baro, wp ) 63 63 ELSE 64 64 zt = zt + joffset * rdt … … 74 74 IF( ln_tide_ramp ) THEN ! linear increase if asked 75 75 zt = ( kt - nit000 ) * rdt 76 IF( PRESENT( kit ) .AND. PRESENT( kbaro ) ) zt = zt + kit * rdt / REAL( kbaro, wp )76 IF( PRESENT( kit ) ) zt = zt + ( kit + joffset -1) * rdt / REAL( nn_baro, wp ) 77 77 zramp = MIN( MAX( zt / (rdttideramp*rday) , 0._wp ) , 1._wp ) 78 78 pot_astro(:,:) = zramp * pot_astro(:,:) … … 86 86 !!---------------------------------------------------------------------- 87 87 CONTAINS 88 SUBROUTINE upd_tide( kt, kit, kbaro, koffset )! Empty routine88 SUBROUTINE upd_tide( kt, kit, time_offset ) ! Empty routine 89 89 INTEGER, INTENT(in) :: kt ! integer arg, dummy routine 90 90 INTEGER, INTENT(in), OPTIONAL :: kit ! optional arg, dummy routine 91 INTEGER, INTENT(in), OPTIONAL :: kbaro ! optional arg, dummy routine 92 INTEGER, INTENT(in), OPTIONAL :: koffset ! optional arg, dummy routine 91 INTEGER, INTENT(in), OPTIONAL :: time_offset ! optional arg, dummy routine 93 92 WRITE(*,*) 'upd_tide: You should not have seen this print! error?', kt 94 93 END SUBROUTINE upd_tide 94 95 95 #endif 96 96 -
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90
r6004 r6030 148 148 CALL lbc_lnk( tsb(:,:,:,jn), 'T', 1._wp ) 149 149 CALL lbc_lnk( tsn(:,:,:,jn), 'T', 1._wp ) 150 CALL lbc_lnk( tsa(:,:,:,jn), 'T', 1._wp ) 150 151 END DO 151 152 ENDIF -
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/SETTE/sette.sh
r5836 r6030 168 168 set_namelist namelist_cfg ln_clobber .true. 169 169 set_namelist namelist_cfg nn_fwb 0 170 170 # set_namelist namelist_cfg nn_solv 2 171 171 set_namelist namelist_cfg jpni 2 172 172 set_namelist namelist_cfg jpnj 2 … … 192 192 set_namelist namelist_cfg ln_clobber .true. 193 193 set_namelist namelist_cfg nn_fwb 0 194 194 # set_namelist namelist_cfg nn_solv 2 195 195 set_namelist namelist_cfg jpni 2 196 196 set_namelist namelist_cfg jpnj 2 … … 238 238 set_namelist namelist_cfg ln_ctl .false. 239 239 set_namelist namelist_cfg ln_clobber .true. 240 240 # set_namelist namelist_cfg nn_solv 2 241 241 set_namelist namelist_cfg jpni 1 242 242 set_namelist namelist_cfg jpnj 4 … … 265 265 set_namelist namelist_cfg ln_ctl .false. 266 266 set_namelist namelist_cfg ln_clobber .true. 267 267 # set_namelist namelist_cfg nn_solv 2 268 268 set_namelist namelist_cfg jpni 2 269 269 set_namelist namelist_cfg jpnj 2 … … 304 304 set_namelist namelist_cfg jpnj 4 305 305 set_namelist namelist_cfg jpnij 8 306 306 # set_namelist namelist_cfg nn_solv 2 307 307 set_namelist namelist_top_cfg ln_trcdta .false. 308 308 set_namelist namelist_top_cfg ln_diatrc .false. … … 340 340 set_namelist namelist_cfg jpnj 4 341 341 set_namelist namelist_cfg jpnij 8 342 342 # set_namelist namelist_cfg nn_solv 2 343 343 set_namelist namelist_top_cfg ln_diatrc .false. 344 344 set_namelist namelist_top_cfg ln_rsttr .true. … … 398 398 set_namelist namelist_cfg jpnj 4 399 399 set_namelist namelist_cfg jpnij 16 400 400 # set_namelist namelist_cfg nn_solv 2 401 401 set_namelist namelist_top_cfg ln_trcdta .false. 402 402 set_namelist namelist_top_cfg ln_diatrc .false. … … 437 437 set_namelist namelist_cfg jpnj 8 438 438 set_namelist namelist_cfg jpnij 16 439 439 # set_namelist namelist_cfg nn_solv 2 440 440 set_namelist namelist_top_cfg ln_trcdta .false. 441 441 set_namelist namelist_top_cfg ln_diatrc .false. … … 658 658 set_namelist namelist_cfg jpnj 2 659 659 set_namelist namelist_cfg jpnij 4 660 660 # set_namelist namelist_cfg nn_solv 2 661 661 if [ ${USING_MPMD} == "yes" ] ; then 662 662 set_xio_using_server iodef.xml true … … 682 682 set_namelist namelist_cfg jpnj 2 683 683 set_namelist namelist_cfg jpnij 4 684 684 # set_namelist namelist_cfg nn_solv 2 685 685 set_namelist namelist_cfg cn_ocerst_in \"O2L3_LONG_00000075_restart\" 686 686 set_namelist namelist_ice_cfg cn_icerst_in \"O2L3_LONG_00000075_restart_ice\" … … 723 723 set_namelist namelist_cfg jpnj 4 724 724 set_namelist namelist_cfg jpnij 16 725 725 # set_namelist namelist_cfg nn_solv 2 726 726 if [ ${USING_MPMD} == "yes" ] ; then 727 727 set_xio_using_server iodef.xml true … … 748 748 set_namelist namelist_cfg jpnj 8 749 749 set_namelist namelist_cfg jpnij 16 750 750 # set_namelist namelist_cfg nn_solv 2 751 751 if [ ${USING_MPMD} == "yes" ] ; then 752 752 set_xio_using_server iodef.xml true … … 1019 1019 set_namelist namelist_cfg ln_clobber .true. 1020 1020 set_namelist namelist_cfg nn_fwb 0 1021 1021 # set_namelist namelist_cfg nn_solv 2 1022 1022 set_namelist namelist_cfg jpni 2 1023 1023 set_namelist namelist_cfg jpnj 2 … … 1043 1043 set_namelist namelist_cfg ln_clobber .true. 1044 1044 set_namelist namelist_cfg nn_fwb 0 1045 1045 # set_namelist namelist_cfg nn_solv 2 1046 1046 set_namelist namelist_cfg jpni 2 1047 1047 set_namelist namelist_cfg jpnj 2 … … 1088 1088 set_namelist namelist_cfg ln_ctl .false. 1089 1089 set_namelist namelist_cfg ln_clobber .true. 1090 1090 # set_namelist namelist_cfg nn_solv 2 1091 1091 set_namelist namelist_cfg jpni 1 1092 1092 set_namelist namelist_cfg jpnj 4 … … 1115 1115 set_namelist namelist_cfg ln_ctl .false. 1116 1116 set_namelist namelist_cfg ln_clobber .true. 1117 1117 # set_namelist namelist_cfg nn_solv 2 1118 1118 set_namelist namelist_cfg jpni 2 1119 1119 set_namelist namelist_cfg jpnj 2 … … 1154 1154 set_namelist namelist_cfg jpnj 4 1155 1155 set_namelist namelist_cfg jpnij 16 1156 1156 # set_namelist namelist_cfg nn_solv 2 1157 1157 set_namelist namelist_cfg ln_t3d .true. 1158 1158 set_namelist namelist_cfg ln_s3d .true. … … 1193 1193 set_namelist namelist_cfg jpnj 8 1194 1194 set_namelist namelist_cfg jpnij 16 1195 1195 # set_namelist namelist_cfg nn_solv 2 1196 1196 set_namelist namelist_cfg ln_t3d .true. 1197 1197 set_namelist namelist_cfg ln_s3d .true. … … 1347 1347 set_namelist namelist_cfg jpnj 2 1348 1348 set_namelist namelist_cfg jpnij 4 1349 1349 # set_namelist namelist_cfg nn_solv 2 1350 1350 # 1351 1351 set_namelist 1_namelist_cfg cn_exp \"O2LP_LONG\" … … 1380 1380 1381 1381 set_namelist namelist_cfg jpnij 4 1382 1382 # set_namelist namelist_cfg nn_solv 2 1383 1383 set_namelist 1_namelist_cfg cn_exp \"O2LP_SHORT\" 1384 1384 set_namelist 1_namelist_cfg nn_it000 151 … … 1432 1432 set_namelist namelist_cfg jpnj 4 1433 1433 set_namelist namelist_cfg jpnij 16 1434 1434 # set_namelist namelist_cfg nn_solv 2 1435 1435 # 1436 1436 set_namelist 1_namelist_cfg nn_it000 1 … … 1464 1464 set_namelist namelist_cfg jpnj 8 1465 1465 set_namelist namelist_cfg jpnij 16 1466 1466 # set_namelist namelist_cfg nn_solv 2 1467 1467 # 1468 1468 set_namelist 1_namelist_cfg nn_it000 1
Note: See TracChangeset
for help on using the changeset viewer.