Changeset 4981 for branches/2014/dev_MERGE_2014/NEMOGCM/NEMO
- Timestamp:
- 2014-12-10T10:49:53+01:00 (10 years ago)
- Location:
- branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
r4968 r4981 405 405 ! d - thickness diffusion transport: boundary conditions 406 406 ! (stored for tracer advction and continuity equation) 407 CALL lbc_lnk( un_td , 'U' , -1. )408 CALL lbc_lnk( vn_td , 'V' , -1. )407 CALL lbc_lnk( un_td , 'U' , -1._wp) 408 CALL lbc_lnk( vn_td , 'V' , -1._wp) 409 409 410 410 ! 4 - Time stepping of baroclinic scale factors … … 417 417 z2dt = 2.0_wp * rdt 418 418 ENDIF 419 CALL lbc_lnk( tilde_e3t_a(:,:,:), 'T', 1. )419 CALL lbc_lnk( tilde_e3t_a(:,:,:), 'T', 1._wp ) 420 420 tilde_e3t_a(:,:,:) = tilde_e3t_b(:,:,:) + z2dt * tmask(:,:,:) * tilde_e3t_a(:,:,:) 421 421 … … 736 736 IF( l_is_orca ) CALL dom_vvl_orca_fix( pe3_in, pe3_out, pout ) 737 737 ! boundary conditions 738 CALL lbc_lnk( pe3_out(:,:,:), 'U', 1. )738 CALL lbc_lnk( pe3_out(:,:,:), 'U', 1._wp ) 739 739 pe3_out(:,:,:) = pe3_out(:,:,:) + e3u_0(:,:,:) 740 740 ! ! ------------------------------------- ! … … 754 754 IF( l_is_orca ) CALL dom_vvl_orca_fix( pe3_in, pe3_out, pout ) 755 755 ! boundary conditions 756 CALL lbc_lnk( pe3_out(:,:,:), 'V', 1. )756 CALL lbc_lnk( pe3_out(:,:,:), 'V', 1._wp ) 757 757 pe3_out(:,:,:) = pe3_out(:,:,:) + e3v_0(:,:,:) 758 758 ! ! ------------------------------------- ! … … 772 772 IF( l_is_orca ) CALL dom_vvl_orca_fix( pe3_in, pe3_out, pout ) 773 773 ! boundary conditions 774 CALL lbc_lnk( pe3_out(:,:,:), 'F', 1. )774 CALL lbc_lnk( pe3_out(:,:,:), 'F', 1._wp ) 775 775 pe3_out(:,:,:) = pe3_out(:,:,:) + e3f_0(:,:,:) 776 776 ! ! ------------------------------------- ! … … 850 850 CALL iom_get( numror, jpdom_autoglo, 'fse3t_n', fse3t_n(:,:,:) ) 851 851 ! needed to restart if land processor not computed 852 IF(lwp) write(numout,*) 'dom_vvl_rst : fse3t_b and fse3t_n found in restart files' 852 853 WHERE ( tmask(:,:,:) == 0.0_wp ) 853 854 fse3t_n(:,:,:) = e3t_0(:,:,:) … … 877 878 DO jk=1,jpk 878 879 fse3t_n(:,:,jk) = e3t_0(:,:,jk) * ( ht_0(:,:) + sshn(:,:) ) & 879 & / ( ht_0(:,:) + 1._wp - tmask_i(:,:) ) * tmask(:,:,jk) &880 & / ( ht_0(:,:) + 1._wp - ssmask(:,:) ) * tmask(:,:,jk) & 880 881 & + e3t_0(:,:,jk) * (1._wp -tmask(:,:,jk)) 881 882 END DO -
branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
r4946 r4981 1699 1699 ! 1700 1700 CALL wrk_dealloc( jpi, jpj, jpk, zprt ) 1701 CALL wrk_dealloc( jpi, jpj, zmask, zbathy )1701 CALL wrk_dealloc( jpi, jpj, zmask, zbathy, zrisfdep ) 1702 1702 CALL wrk_dealloc( jpi, jpj, zmisfdep, zmbathy ) 1703 1703 ! -
branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
r4946 r4981 120 120 CALL iom_rstput( kt, nitrst, numrow, 'hdivb' , hdivb ) 121 121 CALL iom_rstput( kt, nitrst, numrow, 'sshb' , sshb ) 122 IF( lk_vvl ) THEN ! need for ISF 123 CALL iom_rstput( kt, nitrst, numrow, 'fse3t_b', fse3t_b(:,:,:) ) 124 CALL iom_rstput( kt, nitrst, numrow, 'fse3t ', fse3t (:,:,:) ) 125 CALL iom_rstput( kt, nitrst, numrow, 'fse3w ', fse3w (:,:,:) ) 126 CALL iom_rstput( kt, nitrst, numrow, 'fsdepw ', fsdepw (:,:,:) ) 127 END IF 128 IF( lk_lim3 .AND. .NOT. lk_vvl ) CALL iom_rstput( kt, nitrst, numrow, 'fse3t_b', fse3t_b(:,:,:) ) 122 ! 123 IF( lk_lim3 ) CALL iom_rstput( kt, nitrst, numrow, 'fse3t_b', fse3t_b(:,:,:) ) 129 124 ! 130 125 CALL iom_rstput( kt, nitrst, numrow, 'un' , un ) ! now fields -
branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
r4666 r4981 186 186 CALL iom_rstput( kt, nitrst, numrow, 'rnf_sc_b', rnf_tsc(:,:,jp_sal) ) 187 187 ENDIF 188 CALL wrk_dealloc( jpi,jpj, ztfrz) 188 189 ! 189 190 END SUBROUTINE sbc_rnf -
branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90
r4946 r4981 213 213 ENDIF 214 214 ! 215 CALL wrk_dealloc( jpi,jpj, z msks, zmskf, zmskd1, zmskd2, zmskd3 )215 CALL wrk_dealloc( jpi,jpj, zrau, zmsks, zmskf, zmskd1, zmskd2, zmskd3 ) 216 216 ! 217 217 IF( nn_timing == 1 ) CALL timing_stop('zdf_ddm')
Note: See TracChangeset
for help on using the changeset viewer.