Changeset 6073 for branches/2015/dev_merge_2015/NEMOGCM/NEMO
- Timestamp:
- 2015-12-16T17:37:14+01:00 (9 years ago)
- Location:
- branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diacfl.F90
r6069 r6073 83 83 84 84 ! Courant number for z-direction (vertical current) 85 zcw_cfl(ji,jj,jk) = ABS(wn(ji,jj,jk))*dt/ fse3w_n(ji,jj,jk)85 zcw_cfl(ji,jj,jk) = ABS(wn(ji,jj,jk))*dt/e3w_n(ji,jj,jk) 86 86 END DO 87 87 END DO -
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90
r6060 r6073 80 80 DO ji = fs_2, jpi ! vector opt. 81 81 ! ! ahm * e3 * curl (computed from 1 to jpim1/jpjm1) 82 !!gm open question here : fse3f at before or now ? probably now...82 !!gm open question here : e3f at before or now ? probably now... 83 83 !!gm note that ahmf has already been multiplied by fmask 84 84 zcur(ji-1,jj-1) = ahmf(ji-1,jj-1,jk) * e3f_n(ji-1,jj-1,jk) * r1_e1e2f(ji-1,jj-1) & -
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
r6069 r6073 148 148 CALL iom_rstput( kt, nitrst, numrow, 'vmask' , vmask ) ! need to correct barotropic velocity 149 149 CALL iom_rstput( kt, nitrst, numrow, 'smask' , ssmask ) ! need to correct barotropic velocity 150 CALL iom_rstput( kt, nitrst, numrow, ' fse3t_n', fse3t_n(:,:,:) ) ! need to compute temperature correction151 CALL iom_rstput( kt, nitrst, numrow, ' fse3u_n', fse3u_n(:,:,:) ) ! need to compute bt conservation152 CALL iom_rstput( kt, nitrst, numrow, ' fse3v_n', fse3v_n(:,:,:) ) ! need to compute bt conservation153 CALL iom_rstput( kt, nitrst, numrow, ' fsdepw_n', fsdepw_n(:,:,:) ) ! need to compute extrapolation if vvl150 CALL iom_rstput( kt, nitrst, numrow, 'e3t_n', e3t_n(:,:,:) ) ! need to compute temperature correction 151 CALL iom_rstput( kt, nitrst, numrow, 'e3u_n', e3u_n(:,:,:) ) ! need to compute bt conservation 152 CALL iom_rstput( kt, nitrst, numrow, 'e3v_n', e3v_n(:,:,:) ) ! need to compute bt conservation 153 CALL iom_rstput( kt, nitrst, numrow, 'gdepw_n', gdepw_n(:,:,:) ) ! need to compute extrapolation if vvl 154 154 END IF 155 155 ENDIF -
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
r6069 r6073 529 529 !! * Modules used 530 530 USE dom_oce, ONLY : & ! Ocean space and time domain variables 531 #if defined key_vvl532 531 & gdept_n 533 #else534 532 & gdept_1d 535 #endif536 533 USE phycst, ONLY : & ! Physical constants 537 534 & rday … … 647 644 & kstp, jpi, jpj, jpk, nit000, idaystp, & 648 645 & zprofvar1, zprofvar2, & 649 & fsdept(:,:,:), fsdepw(:,:,:), &646 & gdept_n(:,:,:), gdepw_n(:,:,:), & 650 647 & tmask, nn_1dint, nn_2dint, & 651 648 & kdailyavtypes = nn_profdavtypes ) -
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90
r6069 r6073 30 30 & glamt, glamu, glamv, & 31 31 & gphit, gphiu, gphiv, & 32 #if defined key_vvl 33 & gdept_n 34 #else 35 & gdept_0 36 #endif 32 & gdept_n, gdept_0 37 33 USE lib_mpp, ONLY : & 38 34 & ctl_warn, ctl_stop … … 547 543 !! * Modules used 548 544 USE obs_profiles_def ! Definition of storage space for profile obs. 549 USE dom_oce, ONLY : &550 #if defined key_vvl551 & gdepw_n552 #else553 & gdepw_0554 #endif555 545 556 546 IMPLICIT NONE -
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90
r6069 r6073 1057 1057 & gdepw_1d, & 1058 1058 & gdepw_0, & 1059 #if defined key_vvl1060 1059 & gdepw_n, & 1061 1060 & gdept_n, & 1062 #endif1063 1061 & ln_zco, & 1064 1062 & ln_zps … … 1150 1148 IF ( .NOT.( ln_zps .OR. ln_zco ) ) THEN 1151 1149 ! Need to know the bathy depth for each observation for sco 1152 CALL obs_int_comm_3d( 2, 2, kprofno, kpi, kpj, kpk, igrdi, igrdj, fsdepw(:,:,:), &1150 CALL obs_int_comm_3d( 2, 2, kprofno, kpi, kpj, kpk, igrdi, igrdj, gdepw_n(:,:,:), & 1153 1151 & zgdepw ) 1154 1152 ENDIF -
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
r6060 r6073 567 567 ! 568 568 !!gm Not sure of that coding for ISF.... 569 ! where wmask = 0 set zmxlm == fse3w569 ! where wmask = 0 set zmxlm == e3w_n 570 570 CASE ( 0 ) ! bounded by the distance to surface and bottom 571 571 DO jk = 2, jpkm1 -
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90
r6069 r6073 293 293 !! place. 294 294 !! 295 !!jc2: dynnxt must be the latest call. fse3t_b are indeed updated in that routine295 !!jc2: dynnxt must be the latest call. e3t_b are indeed updated in that routine 296 296 CALL tra_nxt ( kstp ) ! finalize (bcs) tracer fields at next time step and swap 297 297 CALL dyn_nxt ( kstp ) ! finalize (bcs) velocities at next time step and swap
Note: See TracChangeset
for help on using the changeset viewer.