- Timestamp:
- 2020-05-14T21:46:00+02:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser
- Files:
-
- 6 edited
-
. (modified) (1 prop)
-
tests/OVERFLOW/MY_SRC/usrdef_hgr.F90 (modified) (2 diffs)
-
tests/OVERFLOW/MY_SRC/usrdef_istate.F90 (modified) (1 diff)
-
tests/OVERFLOW/MY_SRC/usrdef_nam.F90 (modified) (1 diff)
-
tests/OVERFLOW/MY_SRC/usrdef_sbc.F90 (modified) (4 diffs)
-
tests/OVERFLOW/MY_SRC/usrdef_zgr.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser
- Property svn:externals
-
old new 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 8 9 # SETTE 10 ^/utils/CI/sette@HEAD sette
-
- Property svn:externals
-
NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/OVERFLOW/MY_SRC/usrdef_hgr.F90
r10074 r12928 26 26 PUBLIC usr_def_hgr ! called by domhgr.F90 27 27 28 !! * Substitutions 29 # include "do_loop_substitute.h90" 28 30 !!---------------------------------------------------------------------- 29 31 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 72 74 ! !== grid point position ==! (in kilometers) 73 75 zfact = rn_dx * 1.e-3 ! conversion in km 74 DO jj = 1, jpj 75 DO ji = 1, jpi ! longitude 76 plamt(ji,jj) = zfact * ( - 0.5 + REAL( ji-1 + nimpp-1 , wp ) ) 77 plamu(ji,jj) = zfact * ( REAL( ji-1 + nimpp-1 , wp ) ) 78 plamv(ji,jj) = plamt(ji,jj) 79 plamf(ji,jj) = plamu(ji,jj) 80 ! ! latitude 81 pphit(ji,jj) = zfact * ( - 0.5 + REAL( jj-1 + njmpp-1 , wp ) ) 82 pphiu(ji,jj) = pphit(ji,jj) 83 pphiv(ji,jj) = zfact * ( REAL( jj-1 + njmpp-1 , wp ) ) 84 pphif(ji,jj) = pphiv(ji,jj) 85 END DO 86 END DO 76 DO_2D_11_11 77 ! ! longitude 78 plamt(ji,jj) = zfact * ( - 0.5 + REAL( ji-1 + nimpp-1 , wp ) ) 79 plamu(ji,jj) = zfact * ( REAL( ji-1 + nimpp-1 , wp ) ) 80 plamv(ji,jj) = plamt(ji,jj) 81 plamf(ji,jj) = plamu(ji,jj) 82 ! ! latitude 83 pphit(ji,jj) = zfact * ( - 0.5 + REAL( jj-1 + njmpp-1 , wp ) ) 84 pphiu(ji,jj) = pphit(ji,jj) 85 pphiv(ji,jj) = zfact * ( REAL( jj-1 + njmpp-1 , wp ) ) 86 pphif(ji,jj) = pphiv(ji,jj) 87 END_2D 87 88 ! 88 89 ! !== Horizontal scale factors ==! (in meters) -
NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/OVERFLOW/MY_SRC/usrdef_istate.F90
r10074 r12928 60 60 ! 61 61 ! rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1) 62 ! rho = r au0 - rn_a0 * (T-10)62 ! rho = rho0 - rn_a0 * (T-10) 63 63 ! delta_T = 10 degrees ==>> delta_rho = 10 * rn_a0 = 2 kg/m3 64 64 ! -
NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/OVERFLOW/MY_SRC/usrdef_nam.F90
r12178 r12928 61 61 !!---------------------------------------------------------------------- 62 62 ! 63 REWIND( numnam_cfg ) ! Namelist namusr_def (exist in namelist_cfg only)64 63 READ ( numnam_cfg, namusr_def, IOSTAT = ios, ERR = 902 ) 65 64 902 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namusr_def in configuration namelist' ) -
NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/OVERFLOW/MY_SRC/usrdef_sbc.F90
r10074 r12928 31 31 PUBLIC usrdef_sbc_ice_flx ! routine called by icestp.F90 for ice thermo 32 32 33 !! * Substitutions34 # include "vectopt_loop_substitute.h90"35 33 !!---------------------------------------------------------------------- 36 34 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 40 38 CONTAINS 41 39 42 SUBROUTINE usrdef_sbc_oce( kt )40 SUBROUTINE usrdef_sbc_oce( kt, Kbb ) 43 41 !!--------------------------------------------------------------------- 44 42 !! *** ROUTINE usr_def_sbc *** … … 55 53 !!---------------------------------------------------------------------- 56 54 INTEGER, INTENT(in) :: kt ! ocean time step 55 INTEGER, INTENT(in) :: Kbb ! ocean time index 57 56 !!--------------------------------------------------------------------- 58 57 ! … … 80 79 END SUBROUTINE usrdef_sbc_ice_tau 81 80 82 SUBROUTINE usrdef_sbc_ice_flx( kt ) 81 82 SUBROUTINE usrdef_sbc_ice_flx( kt, phs, phi ) 83 83 INTEGER, INTENT(in) :: kt ! ocean time step 84 REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phs ! snow thickness 85 REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phi ! ice thickness 84 86 END SUBROUTINE usrdef_sbc_ice_flx 85 87 -
NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/tests/OVERFLOW/MY_SRC/usrdef_zgr.F90
r11077 r12928 29 29 PUBLIC usr_def_zgr ! called by domzgr.F90 30 30 31 !! * Substitutions32 # include " vectopt_loop_substitute.h90"31 !! * Substitutions 32 # include "do_loop_substitute.h90" 33 33 !!---------------------------------------------------------------------- 34 34 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 184 184 pe3vw(:,:,jk) = pe3w_1d (jk) 185 185 END DO 186 DO jj = 1, jpj ! bottom scale factors and depth at T- and W-points 187 DO ji = 1, jpi 188 ik = k_bot(ji,jj) 189 pdepw(ji,jj,ik+1) = MIN( zht(ji,jj) , pdepw_1d(ik+1) ) 190 pe3t (ji,jj,ik ) = pdepw(ji,jj,ik+1) - pdepw(ji,jj,ik) 191 pe3t (ji,jj,ik+1) = pe3t (ji,jj,ik ) 192 ! 193 pdept(ji,jj,ik ) = pdepw(ji,jj,ik ) + pe3t (ji,jj,ik ) * 0.5_wp 194 pdept(ji,jj,ik+1) = pdepw(ji,jj,ik+1) + pe3t (ji,jj,ik+1) * 0.5_wp 195 pe3w (ji,jj,ik+1) = pdept(ji,jj,ik+1) - pdept(ji,jj,ik) ! = pe3t (ji,jj,ik ) 196 END DO 197 END DO 186 DO_2D_11_11 187 ik = k_bot(ji,jj) 188 pdepw(ji,jj,ik+1) = MIN( zht(ji,jj) , pdepw_1d(ik+1) ) 189 pe3t (ji,jj,ik ) = pdepw(ji,jj,ik+1) - pdepw(ji,jj,ik) 190 pe3t (ji,jj,ik+1) = pe3t (ji,jj,ik ) 191 ! 192 pdept(ji,jj,ik ) = pdepw(ji,jj,ik ) + pe3t (ji,jj,ik ) * 0.5_wp 193 pdept(ji,jj,ik+1) = pdepw(ji,jj,ik+1) + pe3t (ji,jj,ik+1) * 0.5_wp 194 pe3w (ji,jj,ik+1) = pdept(ji,jj,ik+1) - pdept(ji,jj,ik) ! = pe3t (ji,jj,ik ) 195 END_2D 198 196 ! ! bottom scale factors and depth at U-, V-, UW and VW-points 199 197 ! ! usually Computed as the minimum of neighbooring scale factors
Note: See TracChangeset
for help on using the changeset viewer.
