Changeset 13540 for NEMO/branches/2020/r12377_ticket2386/tests/BENCH
- Timestamp:
- 2020-09-29T12:41:06+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/r12377_ticket2386
- Files:
-
- 1 deleted
- 10 edited
-
. (modified) (1 prop)
-
tests/BENCH/EXPREF/namelist_cfg_orca025_like (modified) (4 diffs)
-
tests/BENCH/EXPREF/namelist_cfg_orca12_like (modified) (4 diffs)
-
tests/BENCH/EXPREF/namelist_cfg_orca1_like (modified) (4 diffs)
-
tests/BENCH/EXPREF/namelist_pisces_cfg (modified) (1 diff)
-
tests/BENCH/MY_SRC/usrdef_hgr.F90 (modified) (4 diffs)
-
tests/BENCH/MY_SRC/usrdef_istate.F90 (modified) (4 diffs)
-
tests/BENCH/MY_SRC/usrdef_nam.F90 (modified) (2 diffs)
-
tests/BENCH/MY_SRC/usrdef_sbc.F90 (modified) (5 diffs)
-
tests/BENCH/MY_SRC/usrdef_zgr.F90 (modified) (1 diff)
-
tests/BENCH/MY_SRC/zdfiwm.F90 (deleted)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/r12377_ticket2386
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev @HEADext/AGRIF5 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 8 8 9 9 # SETTE 10 ^/utils/CI/sette@ HEADsette10 ^/utils/CI/sette@13507 sette
-
- Property svn:externals
-
NEMO/branches/2020/r12377_ticket2386/tests/BENCH/EXPREF/namelist_cfg_orca025_like
r12511 r13540 15 15 &namusr_def ! User defined : BENCH configuration: Flat bottom, beta-plane 16 16 !----------------------------------------------------------------------- 17 nn_isize = 144 2! number of point in i-direction of global(local) domain if >0 (<0)18 nn_jsize = 120 7 !! 1050! number of point in j-direction of global(local) domain if >0 (<0)17 nn_isize = 1440 ! number of point in i-direction of global(local) domain if >0 (<0) 18 nn_jsize = 1206 !! 1049 ! number of point in j-direction of global(local) domain if >0 (<0) 19 19 nn_ksize = 75 ! total number of point in k-direction 20 20 nn_perio = 4 ! periodicity … … 30 30 &namctl ! Control prints (default: OFF) 31 31 !----------------------------------------------------------------------- 32 nn_print = 0 ! level of print (0 no extra print)33 32 ln_timing = .false. ! timing by routine write out in timing.output file 34 33 / … … 50 49 !----------------------------------------------------------------------- 51 50 ln_usr = .true. ! user defined formulation (T => check usrdef_sbc) 51 nn_ice = 2 ! =0 no ice boundary condition 52 ! ! =1 use observed ice-cover ( => fill namsbc_iif ) 53 ! ! =2 or 3 for SI3 and CICE, respectively 52 54 ln_traqsr = .true. ! Light penetration in the ocean (T => fill namtra_qsr) 53 55 / … … 75 77 !! !! 76 78 !! namdrg top/bottom drag coefficient (default: NO selection) 77 !! namdrg_top top friction (ln_ OFF =F & ln_isfcav=T)78 !! namdrg_bot bottom friction (ln_ OFF =F)79 !! namdrg_top top friction (ln_drg_OFF =F & ln_isfcav=T) 80 !! namdrg_bot bottom friction (ln_drg_OFF =F) 79 81 !! nambbc bottom temperature boundary condition (default: OFF) 80 82 !! nambbl bottom boundary layer scheme (default: OFF) -
NEMO/branches/2020/r12377_ticket2386/tests/BENCH/EXPREF/namelist_cfg_orca12_like
r12511 r13540 15 15 &namusr_def ! User defined : BENCH configuration: Flat bottom, beta-plane 16 16 !----------------------------------------------------------------------- 17 nn_isize = 432 2! number of point in i-direction of global(local) domain if >0 (<0)18 nn_jsize = 314 7! number of point in j-direction of global(local) domain if >0 (<0)17 nn_isize = 4320 ! number of point in i-direction of global(local) domain if >0 (<0) 18 nn_jsize = 3146 ! number of point in j-direction of global(local) domain if >0 (<0) 19 19 nn_ksize = 75 ! total number of point in k-direction 20 20 nn_perio = 4 ! periodicity … … 30 30 &namctl ! Control prints (default: OFF) 31 31 !----------------------------------------------------------------------- 32 nn_print = 0 ! level of print (0 no extra print)33 32 ln_timing = .false. ! timing by routine write out in timing.output file 34 33 / … … 50 49 !----------------------------------------------------------------------- 51 50 ln_usr = .true. ! user defined formulation (T => check usrdef_sbc) 51 nn_ice = 2 ! =0 no ice boundary condition 52 ! ! =1 use observed ice-cover ( => fill namsbc_iif ) 53 ! ! =2 or 3 for SI3 and CICE, respectively 52 54 ln_traqsr = .true. ! Light penetration in the ocean (T => fill namtra_qsr) 53 55 / … … 75 77 !! !! 76 78 !! namdrg top/bottom drag coefficient (default: NO selection) 77 !! namdrg_top top friction (ln_ OFF =F & ln_isfcav=T)78 !! namdrg_bot bottom friction (ln_ OFF =F)79 !! namdrg_top top friction (ln_drg_OFF =F & ln_isfcav=T) 80 !! namdrg_bot bottom friction (ln_drg_OFF =F) 79 81 !! nambbc bottom temperature boundary condition (default: OFF) 80 82 !! nambbl bottom boundary layer scheme (default: OFF) -
NEMO/branches/2020/r12377_ticket2386/tests/BENCH/EXPREF/namelist_cfg_orca1_like
r12511 r13540 15 15 &namusr_def ! User defined : BENCH configuration: Flat bottom, beta-plane 16 16 !----------------------------------------------------------------------- 17 nn_isize = 36 2! number of point in i-direction of global(local) domain if >0 (<0)18 nn_jsize = 33 2! number of point in j-direction of global(local) domain if >0 (<0)17 nn_isize = 360 ! number of point in i-direction of global(local) domain if >0 (<0) 18 nn_jsize = 331 ! number of point in j-direction of global(local) domain if >0 (<0) 19 19 nn_ksize = 75 ! total number of point in k-direction 20 20 nn_perio = 6 ! periodicity … … 30 30 &namctl ! Control prints (default: OFF) 31 31 !----------------------------------------------------------------------- 32 nn_print = 0 ! level of print (0 no extra print)33 32 ln_timing = .false. ! timing by routine write out in timing.output file 34 33 / … … 50 49 !----------------------------------------------------------------------- 51 50 ln_usr = .true. ! user defined formulation (T => check usrdef_sbc) 51 nn_ice = 2 ! =0 no ice boundary condition 52 ! ! =1 use observed ice-cover ( => fill namsbc_iif ) 53 ! ! =2 or 3 for SI3 and CICE, respectively 52 54 ln_traqsr = .true. ! Light penetration in the ocean (T => fill namtra_qsr) 53 55 / … … 75 77 !! !! 76 78 !! namdrg top/bottom drag coefficient (default: NO selection) 77 !! namdrg_top top friction (ln_ OFF =F & ln_isfcav=T)78 !! namdrg_bot bottom friction (ln_ OFF =F)79 !! namdrg_top top friction (ln_drg_OFF =F & ln_isfcav=T) 80 !! namdrg_bot bottom friction (ln_drg_OFF =F) 79 81 !! nambbc bottom temperature boundary condition (default: OFF) 80 82 !! nambbl bottom boundary layer scheme (default: OFF) -
NEMO/branches/2020/r12377_ticket2386/tests/BENCH/EXPREF/namelist_pisces_cfg
r10343 r13540 81 81 / 82 82 !----------------------------------------------------------------------- 83 &nampis sbc! parameters for inputs deposition83 &nampisbc ! parameters for inputs deposition 84 84 !----------------------------------------------------------------------- 85 ln_dust = .false. ! boolean for dust input from the atmosphere86 ln_solub = .false. ! boolean for variable solubility of atm. Iron87 ln_river = .false. ! boolean for river input of nutrients88 ln_ndepo = .false. ! boolean for atmospheric deposition of N89 85 ln_ironsed = .false. ! boolean for Fe input from sediments 90 86 ln_ironice = .false. ! boolean for Fe input from sea ice -
NEMO/branches/2020/r12377_ticket2386/tests/BENCH/MY_SRC/usrdef_hgr.F90
r9762 r13540 24 24 PUBLIC usr_def_hgr ! called by domhgr.F90 25 25 26 !! * Substitutions 27 # include "do_loop_substitute.h90" 26 28 !!---------------------------------------------------------------------- 27 29 !! NEMO/OPA 4.0, NEMO Consortium (2016) … … 59 61 REAL(wp), DIMENSION(:,:), INTENT(out) :: pe1e2u, pe1e2v ! u- & v-surfaces (if reduction in strait) [m2] 60 62 ! 61 INTEGER :: ji, jj ! dummy loop indices63 INTEGER :: ji, jj ! dummy loop indices 62 64 REAL(wp) :: zres, zf0 63 REAL(wp) :: zti, z ui, ztj, zvj! local scalars65 REAL(wp) :: zti, ztj ! local scalars 64 66 !!------------------------------------------------------------------------------- 65 67 ! … … 70 72 IF(lwp) WRITE(numout,*) ' given by rn_dx and rn_dy' 71 73 ! 72 !73 74 ! Position coordinates (in grid points) 74 ! ========== 75 DO jj = 1, jpj 76 DO ji = 1, jpi 77 78 zti = REAL( ji - 1 + nimpp - 1, wp ) ; ztj = REAL( jj - 1 + njmpp - 1, wp ) 79 zui = REAL( ji - 1 + nimpp - 1, wp ) + 0.5_wp ; zvj = REAL( jj - 1 + njmpp - 1, wp ) + 0.5_wp 75 ! ========== 76 DO_2D( 1, 1, 1, 1 ) 77 78 zti = REAL( mig0_oldcmp(ji) - 1, wp ) ! start at i=0 in the global grid without halos 79 ztj = REAL( mjg0_oldcmp(jj) - 1, wp ) ! start at j=0 in the global grid without halos 80 81 plamt(ji,jj) = zti 82 plamu(ji,jj) = zti + 0.5_wp 83 plamv(ji,jj) = zti 84 plamf(ji,jj) = zti + 0.5_wp 85 86 pphit(ji,jj) = ztj 87 pphiu(ji,jj) = ztj 88 pphiv(ji,jj) = ztj + 0.5_wp 89 pphif(ji,jj) = ztj + 0.5_wp 80 90 81 plamt(ji,jj) = zti 82 plamu(ji,jj) = zui 83 plamv(ji,jj) = zti 84 plamf(ji,jj) = zui 85 86 pphit(ji,jj) = ztj 87 pphiv(ji,jj) = zvj 88 pphiu(ji,jj) = ztj 89 pphif(ji,jj) = zvj 90 91 END DO 92 END DO 91 END_2D 93 92 ! 94 93 ! Horizontal scale factors (in meters) … … 109 108 kff = 1 ! indicate not to compute Coriolis parameter afterward 110 109 ! 111 zf0 110 zf0 = 2._wp * omega * SIN( rad * 45 ) ! constant coriolis factor corresponding to 45°N 112 111 pff_f(:,:) = zf0 113 112 pff_t(:,:) = zf0 -
NEMO/branches/2020/r12377_ticket2386/tests/BENCH/MY_SRC/usrdef_istate.F90
r11536 r13540 28 28 PUBLIC usr_def_istate ! called by istate.F90 29 29 30 !! * Substitutions 31 # include "do_loop_substitute.h90" 30 32 !!---------------------------------------------------------------------- 31 33 !! NEMO/OPA 4.0 , NEMO Consortium (2016) … … 55 57 REAL(wp) :: zfact 56 58 INTEGER :: ji, jj, jk 59 INTEGER :: igloi, igloj ! to be removed in the future, see comment bellow 57 60 !!---------------------------------------------------------------------- 58 61 ! … … 61 64 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~ ' 62 65 ! 63 ! define unique value on each point. z2d ranging from 0.05 to -0.05 64 DO jj = 1, jpj 65 DO ji = 1, jpi 66 z2d(ji,jj) = 0.1 * ( 0.5 - REAL( mig(ji) + mjg(jj) * jpiglo, wp ) / REAL( jpiglo * jpjglo, wp ) ) 67 ENDDO 68 ENDDO 66 ! define unique value on each point of the inner global domain. z2d ranging from 0.05 to -0.05 67 ! 68 ! WARNING: to keep compatibility with the trunk that was including periodocity into the input data, 69 ! we must define z2d as bellow. 70 ! Once we decide to forget trunk compatibility, we must simply define z2d as: 71 !!$ DO_2D( 0, 0, 0, 0 ) 72 !!$ z2d(ji,jj) = 0.1 * ( 0.5 - REAL( mig0_oldcmp(ji) + (mjg0_oldcmp(jj)-1) * Ni0glo, wp ) / REAL( Ni0glo * Nj0glo, wp ) ) 73 !!$ END_2D 74 igloi = Ni0glo + 2 * COUNT( (/ jperio == 1 .OR. jperio == 4 .OR. jperio == 6 .OR. jperio == 7 /) ) 75 igloj = Nj0glo + 2 * COUNT( (/ jperio == 2 .OR. jperio == 7 /) ) + 1 * COUNT( (/ jperio >= 4 .AND. jperio <= 6 /) ) 76 DO_2D( 0, 0, 0, 0 ) 77 z2d(ji,jj) = 0.1 * ( 0.5 - REAL( mig0_oldcmp(ji) + (mjg0_oldcmp(jj)-1) * igloi, wp ) / REAL( igloi * igloj, wp ) ) 78 END_2D 69 79 ! 70 80 ! sea level: 71 81 pssh(:,:) = z2d(:,:) ! +/- 0.05 m 72 82 ! 73 DO jk = 1, jpk83 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 74 84 zfact = REAL(jk-1,wp) / REAL(jpk-1,wp) ! 0 to 1 to add a basic stratification 75 85 ! temperature choosen to lead to ~50% ice at the beginning if rn_thres_sst = 0.5 … … 78 88 pts(:,:,jk,jp_sal) = 30._wp + 1._wp * zfact + z2d(:,:) ! 30 to 31 +/- 0.05 psu 79 89 ! velocities: 80 pu(:,:,jk) = z2d(:,:) * 0.1_wp ! +/- 0.005 m/s 81 pv(:,:,jk) = z2d(:,:) * 0.01_wp ! +/- 0.0005 m/s 82 ENDDO 90 pu(:,:,jk) = z2d(:,:) * 0.1_wp * umask(:,:,jk) ! +/- 0.005 m/s 91 pv(:,:,jk) = z2d(:,:) * 0.01_wp * vmask(:,:,jk) ! +/- 0.0005 m/s 92 END_3D 93 pts(:,:,jpk,:) = 0._wp 94 pu( :,:,jpk ) = 0._wp 95 pv( :,:,jpk ) = 0._wp 83 96 ! 84 97 CALL lbc_lnk('usrdef_istate', pssh, 'T', 1. ) ! apply boundary conditions -
NEMO/branches/2020/r12377_ticket2386/tests/BENCH/MY_SRC/usrdef_nam.F90
r12377 r13540 55 55 ! !!* nammpp namelist *!! 56 56 INTEGER :: jpni, jpnj 57 LOGICAL :: ln_nnogather 57 LOGICAL :: ln_nnogather, ln_listonly 58 58 !! 59 59 NAMELIST/namusr_def/ nn_isize, nn_jsize, nn_ksize, nn_perio 60 NAMELIST/nammpp/ jpni, jpnj, ln_nnogather60 NAMELIST/nammpp/ jpni, jpnj, nn_hls, ln_nnogather, ln_listonly 61 61 !!---------------------------------------------------------------------- 62 62 ! … … 77 77 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'nammpp in configuration namelist' ) 78 78 79 kpi = ( -nn_isize - 2*nn_hls ) * jpni + 2*nn_hls80 kpj = ( -nn_jsize - 2*nn_hls ) * jpnj + 2*nn_hls79 kpi = -nn_isize * jpni 80 kpj = -nn_jsize * jpnj 81 81 ELSE 82 82 kpi = nn_isize -
NEMO/branches/2020/r12377_ticket2386/tests/BENCH/MY_SRC/usrdef_sbc.F90
r12377 r13540 34 34 PUBLIC usrdef_sbc_ice_flx ! routine called by sbcice_lim.F90 for ice thermo 35 35 36 !! * Substitutions 37 # include "do_loop_substitute.h90" 36 38 !!---------------------------------------------------------------------- 37 39 !! NEMO/OPA 4.0 , NEMO Consortium (2016) … … 97 99 REAL(wp), DIMENSION(jpi,jpj) :: z2d ! 2D workspace 98 100 INTEGER :: ji, jj 101 INTEGER :: igloi, igloj ! to be removed in the future, see comment bellow 99 102 !!--------------------------------------------------------------------- 100 103 #if defined key_si3 … … 102 105 ! 103 106 ! define unique value on each point. z2d ranging from 0.05 to -0.05 104 DO jj = 1, jpj 105 DO ji = 1, jpi 106 z2d(ji,jj) = 0.1 * ( 0.5 - REAL( nimpp + ji - 1 + ( njmpp + jj - 2 ) * jpiglo, wp ) / REAL( jpiglo * jpjglo, wp ) ) 107 ENDDO 108 ENDDO 109 utau_ice(:,:) = 0.1_wp + z2d(:,:) 110 vtau_ice(:,:) = 0.1_wp + z2d(:,:) 107 ! 108 ! WARNING: to keep compatibility with the trunk that was including periodocity into the input data, 109 ! we must define z2d as bellow. 110 ! Once we decide to forget trunk compatibility, we must simply define z2d as: 111 !!$ DO_2D( 0, 0, 0, 0 ) 112 !!$ z2d(ji,jj) = 0.1 * ( 0.5 - REAL( mig0_oldcmp(ji) + (mjg0_oldcmp(jj)-1) * Ni0glo, wp ) / REAL( Ni0glo * Nj0glo, wp ) ) 113 !!$ END_2D 114 igloi = Ni0glo + 2 * COUNT( (/ jperio == 1 .OR. jperio == 4 .OR. jperio == 6 .OR. jperio == 7 /) ) 115 igloj = Nj0glo + 2 * COUNT( (/ jperio == 2 .OR. jperio == 7 /) ) + 1 * COUNT( (/ jperio >= 4 .AND. jperio <= 6 /) ) 116 DO_2D( 0, 0, 0, 0 ) 117 z2d(ji,jj) = 0.1 * ( 0.5 - REAL( mig0_oldcmp(ji) + (mjg0_oldcmp(jj)-1) * igloi, wp ) / REAL( igloi * igloj, wp ) ) 118 END_2D 119 utau_ice(:,:) = 0.1_wp + z2d(:,:) 120 vtau_ice(:,:) = 0.1_wp + z2d(:,:) 111 121 112 122 CALL lbc_lnk_multi( 'usrdef_sbc', utau_ice, 'U', -1., vtau_ice, 'V', -1. ) … … 127 137 REAL(wp), DIMENSION(:,:,:), INTENT(in) :: phi ! ice thickness 128 138 !! 129 REAL(wp) :: zfr1, zfr2 ! local variables130 139 REAL(wp), DIMENSION(jpi,jpj) :: zsnw ! snw distribution after wind blowing 131 140 !!--------------------------------------------------------------------- … … 162 171 qsr_tot (:,:) = at_i_b(:,:) * qsr_oce(:,:) + SUM( a_i_b(:,:,:) * qsr_ice(:,:,:), dim=3 ) 163 172 164 ! --- shortwave radiation transmitted below the surface (W/m2, see Grenfell Maykut 77) --- ! 165 zfr1 = ( 0.18 * ( 1.0 - cldf_ice ) + 0.35 * cldf_ice ) ! transmission when hi>10cm 166 zfr2 = ( 0.82 * ( 1.0 - cldf_ice ) + 0.65 * cldf_ice ) ! zfr2 such that zfr1 + zfr2 to equal 1 167 ! 168 WHERE ( phs(:,:,:) <= 0._wp .AND. phi(:,:,:) < 0.1_wp ) ! linear decrease from hi=0 to 10cm 169 qtr_ice_top(:,:,:) = qsr_ice(:,:,:) * ( zfr1 + zfr2 * ( 1._wp - phi(:,:,:) * 10._wp ) ) 170 ELSEWHERE( phs(:,:,:) <= 0._wp .AND. phi(:,:,:) >= 0.1_wp ) ! constant (zfr1) when hi>10cm 171 qtr_ice_top(:,:,:) = qsr_ice(:,:,:) * zfr1 172 ELSEWHERE ! zero when hs>0 173 qtr_ice_top(:,:,:) = 0._wp 174 END WHERE 173 ! --- shortwave radiation transmitted thru the surface scattering layer (W/m2) --- ! 174 qtr_ice_top(:,:,:) = 0._wp 175 175 176 #endif 176 177 -
NEMO/branches/2020/r12377_ticket2386/tests/BENCH/MY_SRC/usrdef_zgr.F90
r12377 r13540 192 192 z2d(:,:) = REAL( jpkm1 , wp ) ! flat bottom 193 193 ! 194 IF( jperio == 3 .OR. jperio ==4 ) THEN ! add a small island in the upper corners to avoid model instabilities... 195 z2d(mi0( 1):mi1( 3),mj0(jpjglo-2):mj1(jpjglo)) = 0. 196 z2d(mi0(jpiglo-2):mi1(jpiglo),mj0(jpjglo-2):mj1(jpjglo)) = 0. 197 ENDIF 194 ! 195 ! BENCH should work without these 2 small islands on the 2 poles of the folding... 196 ! -> Comment out these lines if instabilities are too large... 197 ! 198 199 !!$ IF( jperio == 3 .OR. jperio == 4 ) THEN ! add a small island in the upper corners to avoid model instabilities... 200 !!$ z2d(mi0( nn_hls):mi1( nn_hls+2 ),mj0(jpjglo-nn_hls-1):mj1(jpjglo-nn_hls+1)) = 0. 201 !!$ z2d(mi0(jpiglo-nn_hls):mi1(MIN(jpiglo,jpiglo-nn_hls+2)),mj0(jpjglo-nn_hls-1):mj1(jpjglo-nn_hls+1)) = 0. 202 !!$ z2d(mi0(jpiglo/2 ):mi1( jpiglo/2 +2 ),mj0(jpjglo-nn_hls-1):mj1(jpjglo-nn_hls+1)) = 0. 203 !!$ ENDIF 204 !!$ ! 205 !!$ IF( jperio == 5 .OR. jperio == 6 ) THEN ! add a small island in the upper corners to avoid model instabilities... 206 !!$ z2d(mi0( nn_hls):mi1( nn_hls+1),mj0(jpjglo-nn_hls):mj1(jpjglo-nn_hls+1)) = 0. 207 !!$ z2d(mi0(jpiglo-nn_hls):mi1(jpiglo-nn_hls+1),mj0(jpjglo-nn_hls):mj1(jpjglo-nn_hls+1)) = 0. 208 !!$ z2d(mi0(jpiglo/2 ):mi1(jpiglo/2 +1),mj0(jpjglo-nn_hls):mj1(jpjglo-nn_hls+1)) = 0. 209 !!$ ENDIF 210 198 211 ! 199 212 CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. ) ! set surrounding land to zero (here jperio=0 ==>> closed)
Note: See TracChangeset
for help on using the changeset viewer.
