- Timestamp:
- 2020-06-08T18:11:57+02:00 (8 months ago)
smasson- Location:
- NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests
- Files:
-
- 15 edited
-
BENCH/MY_SRC/usrdef_nam.F90 (modified) (4 diffs)
-
ICE_ADV1D/MY_SRC/usrdef_hgr.F90 (modified) (1 diff)
-
ICE_ADV1D/MY_SRC/usrdef_nam.F90 (modified) (1 diff)
-
ICE_ADV2D/MY_SRC/usrdef_hgr.F90 (modified) (2 diffs)
-
ICE_ADV2D/MY_SRC/usrdef_nam.F90 (modified) (2 diffs)
-
ICE_AGRIF/EXPREF/AGRIF_FixedGrids.in (modified) (1 diff)
-
ICE_AGRIF/MY_SRC/usrdef_hgr.F90 (modified) (1 diff)
-
ICE_AGRIF/MY_SRC/usrdef_nam.F90 (modified) (2 diffs)
-
ISOMIP/MY_SRC/usrdef_nam.F90 (modified) (1 diff)
-
ISOMIP/MY_SRC/usrdef_zgr.F90 (modified) (2 diffs)
-
LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90 (modified) (1 diff)
-
OVERFLOW/MY_SRC/usrdef_nam.F90 (modified) (1 diff)
-
VORTEX/MY_SRC/usrdef_hgr.F90 (modified) (1 diff)
-
VORTEX/MY_SRC/usrdef_nam.F90 (modified) (2 diffs)
-
WAD/MY_SRC/usrdef_nam.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/BENCH/MY_SRC/usrdef_nam.F90
r12989 r13065 29 29 CONTAINS 30 30 31 SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, kperio , khls)31 SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, kperio ) 32 32 !!---------------------------------------------------------------------- 33 33 !! *** ROUTINE dom_nam *** … … 45 45 INTEGER , INTENT(out) :: kpi, kpj, kpk ! global domain sizes 46 46 INTEGER , INTENT(out) :: kperio ! lateral global domain b.c. 47 INTEGER , INTENT(out) :: khls ! halo dimension48 47 ! 49 48 ! … … 58 57 LOGICAL :: ln_nnogather, ln_listonly 59 58 !! 60 NAMELIST/namusr_def/ nn_isize, nn_jsize, nn_ksize, nn_perio , nn_hls61 NAMELIST/nammpp/ jpni, jpnj, ln_nnogather, ln_listonly59 NAMELIST/namusr_def/ nn_isize, nn_jsize, nn_ksize, nn_perio 60 NAMELIST/nammpp/ jpni, jpnj, nn_hls, ln_nnogather, ln_listonly 62 61 !!---------------------------------------------------------------------- 63 62 ! … … 87 86 kpk = nn_ksize 88 87 kperio = nn_perio 89 khls = nn_hls90 88 ! ! control print 91 89 IF(lwp) THEN -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ICE_ADV1D/MY_SRC/usrdef_hgr.F90
r12960 r13065 75 75 76 76 ! ========== 77 zlam0 = -REAL( Ni0glo-1)/2, wp) * 1.e-3 * rn_dx78 zphi0 = -REAL( Nj0glo-1)/2, wp) * 1.e-3 * rn_dy77 zlam0 = -REAL( (Ni0glo-2)/2, wp) * 1.e-3 * rn_dx 78 zphi0 = -REAL( (Nj0glo-2)/2, wp) * 1.e-3 * rn_dy 79 79 80 80 DO_2D_11_11 -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ICE_ADV1D/MY_SRC/usrdef_nam.F90
r12939 r13065 90 90 WRITE(numout,*) ' LX [km]: ', zlx 91 91 WRITE(numout,*) ' LY [km]: ', zly 92 WRITE(numout,*) ' resulting global domain size : jpiglo = ', kpi93 WRITE(numout,*) ' jpjglo = ', kpj92 WRITE(numout,*) ' resulting global domain size : Ni0glo = ', kpi 93 WRITE(numout,*) ' Nj0glo = ', kpj 94 94 WRITE(numout,*) ' jpkglo = ', kpk 95 95 WRITE(numout,*) ' Coriolis:', ln_corio -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ICE_ADV2D/MY_SRC/usrdef_hgr.F90
r12960 r13065 76 76 77 77 ! ========== 78 zlam0 = -REAL( Ni0glo-1)/2, wp) * 1.e-3 * rn_dx79 zphi0 = -REAL( Nj0glo-1)/2, wp) * 1.e-3 * rn_dy78 zlam0 = -REAL( (Ni0glo-2)/2, wp) * 1.e-3 * rn_dx 79 zphi0 = -REAL( (Nj0glo-2)/2, wp) * 1.e-3 * rn_dy 80 80 81 81 #if defined key_agrif … … 83 83 !clem zlam0 = Agrif_Parent(zlam0) + (Agrif_ix())*Agrif_Parent(rn_dx) * 1.e-5 84 84 !clem zphi0 = Agrif_Parent(zphi0) + (Agrif_iy())*Agrif_Parent(rn_dy) * 1.e-5 85 zlam0 = ( 0.5_wp - ( Agrif_parent(jpiglo) - 1 ) / 2) * 1.e-3 * Agrif_irhox() * rn_dx &85 zlam0 = ( 0.5_wp - REAL( (Agrif_parent(Ni0glo) - 2 ) / 2, wp ) ) * 1.e-3 * Agrif_irhox() * rn_dx & 86 86 & + ( Agrif_Ix() + nbghostcells - 1 ) * Agrif_irhox() * rn_dx * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dx * 1.e-3 87 zphi0 = ( 0.5_wp - ( Agrif_parent(jpjglo) - 1 ) / 2) * 1.e-3 * Agrif_irhoy() * rn_dy &87 zphi0 = ( 0.5_wp - REAL( (Agrif_parent(Nj0glo) - 2 ) / 2, wp ) ) * 1.e-3 * Agrif_irhoy() * rn_dy & 88 88 & + ( Agrif_Iy() + nbghostcells - 1 ) * Agrif_irhoy() * rn_dy * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dy * 1.e-3 89 89 ENDIF -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ICE_ADV2D/MY_SRC/usrdef_nam.F90
r12939 r13065 86 86 kpj = NINT( 300.e3 / rn_dy ) - 1 87 87 ELSE 88 kpi = nbcellsx + 2 + 2*nbghostcells89 kpj = nbcellsy + 2 + 2*nbghostcells88 kpi = nbcellsx + 2 * ( nbghostcells + 1 ) ! Global Domain size: add nbghostcells + 1 "land" point on each side 89 kpj = nbcellsy + 2 * ( nbghostcells + 1 ) 90 90 ENDIF 91 91 kpk = 1 … … 110 110 WRITE(numout,*) ' LX [km]: ', zlx 111 111 WRITE(numout,*) ' LY [km]: ', zly 112 WRITE(numout,*) ' resulting global domain size : jpiglo = ', kpi113 WRITE(numout,*) ' jpjglo = ', kpj112 WRITE(numout,*) ' resulting global domain size : Ni0glo = ', kpi 113 WRITE(numout,*) ' Nj0glo = ', kpj 114 114 WRITE(numout,*) ' jpkglo = ', kpk 115 115 WRITE(numout,*) ' Coriolis:', ln_corio -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ICE_AGRIF/EXPREF/AGRIF_FixedGrids.in
r9159 r13065 1 1 1 2 3 4 63 34 633 3 32 33 62 33 62 3 3 3 3 3 0 -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ICE_AGRIF/MY_SRC/usrdef_hgr.F90
r12960 r13065 76 76 77 77 ! ========== 78 zlam0 = -REAL(Ni0glo-1)/2, wp) * 1.e-3 * rn_dx79 zphi0 = -REAL(Nj0glo-1)/2, wp) * 1.e-3 * rn_dy80 81 78 #if defined key_agrif 82 IF( .NOT. Agrif_Root() ) THEN 79 IF( Agrif_Root() ) THEN 80 #endif 81 ! Compatibility WITH old version: 82 ! jperio = 7 => Ni0glo = jpigo_old_version - 2 83 ! => jpiglo-1 replaced by Ni0glo+1 84 zlam0 = -REAL( (Ni0glo+1)/2, wp) * 1.e-3 * rn_dx 85 zphi0 = -REAL( (Nj0glo+1)/2, wp) * 1.e-3 * rn_dy ! +1 for compatibility with old version --> to be replaced by -1 as before 86 #if defined key_agrif 87 ELSE 88 ! ! let lower left longitude and latitude from parent 83 89 !clem zlam0 = Agrif_Parent(zlam0) + (Agrif_ix())*Agrif_Parent(rn_dx) * 1.e-5 84 90 !clem zphi0 = Agrif_Parent(zphi0) + (Agrif_iy())*Agrif_Parent(rn_dy) * 1.e-5 85 zlam0 = ( 0.5_wp - ( Agrif_parent(jpiglo) - 1 ) / 2 ) * 1.e-3 * Agrif_irhox() * rn_dx & 91 ! Compatibility WITH old version: 92 ! jperio = 0 => Ni0glo = jpigo_old_version 93 ! => Agrif_parent(jpiglo)-1 replaced by Agrif_parent(Ni0glo)-1 94 zlam0 = ( 0.5_wp - REAL( ( Agrif_parent(Ni0glo)-1 ) / 2, wp) ) * 1.e-3 * Agrif_irhox() * rn_dx & 86 95 & + ( Agrif_Ix() + nbghostcells - 1 ) * Agrif_irhox() * rn_dx * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dx * 1.e-3 87 zphi0 = ( 0.5_wp - ( Agrif_parent(jpjglo) - 1 ) / 2) * 1.e-3 * Agrif_irhoy() * rn_dy &96 zphi0 = ( 0.5_wp - REAL( ( Agrif_parent(Nj0glo)-1 ) / 2, wp) ) * 1.e-3 * Agrif_irhoy() * rn_dy & 88 97 & + ( Agrif_Iy() + nbghostcells - 1 ) * Agrif_irhoy() * rn_dy * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dy * 1.e-3 89 98 ENDIF -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ICE_AGRIF/MY_SRC/usrdef_nam.F90
r12939 r13065 85 85 kpi = NINT( 300.e3 / rn_dx ) - 1 86 86 kpj = NINT( 300.e3 / rn_dy ) - 1 87 kpi = kpi - 2 ! for compatibility with old version (because kerio=7) --> to be removed 88 kpj = kpj - 2 ! for compatibility with old version (because kerio=7) --> to be removed 87 89 ELSE 88 kpi = nbcellsx + 2 + 2*nbghostcells89 kpj = nbcellsy + 2 + 2*nbghostcells90 kpi = nbcellsx + 2 * ( nbghostcells + 1 ) ! Global Domain size: add nbghostcells + 1 "land" point on each side 91 kpj = nbcellsy + 2 * ( nbghostcells + 1 ) 90 92 ENDIF 91 93 kpk = 2 … … 110 112 WRITE(numout,*) ' LX [km]: ', zlx 111 113 WRITE(numout,*) ' LY [km]: ', zly 112 WRITE(numout,*) ' resulting global domain size : jpiglo = ', kpi113 WRITE(numout,*) ' jpjglo = ', kpj114 WRITE(numout,*) ' resulting global domain size : Ni0glo = ', kpi 115 WRITE(numout,*) ' Nj0glo = ', kpj 114 116 WRITE(numout,*) ' jpkglo = ', kpk 115 117 WRITE(numout,*) ' Coriolis:', ln_corio -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ISOMIP/MY_SRC/usrdef_nam.F90
r12939 r13065 94 94 WRITE(numout,*) ' vertical resolution rn_e3 = ', rn_e3 , ' meters' 95 95 WRITE(numout,*) ' ISOMIP domain = 15° x 10° x 900 m' 96 WRITE(numout,*) ' resulting global domain size : jpiglo = ', kpi97 WRITE(numout,*) ' jpjglo = ', kpj96 WRITE(numout,*) ' resulting global domain size : Ni0glo = ', kpi 97 WRITE(numout,*) ' Nj0glo = ', kpj 98 98 WRITE(numout,*) ' jpkglo = ', kpk 99 99 WRITE(numout,*) ' ' -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ISOMIP/MY_SRC/usrdef_zgr.F90
r12939 r13065 67 67 REAL(wp), DIMENSION(jpi,jpj) :: zht , zhu ! bottom depth 68 68 REAL(wp), DIMENSION(jpi,jpj) :: zhisf, zhisfu ! top depth 69 REAL(wp), DIMENSION(jpi,jpj) :: zmsk70 REAL(wp), DIMENSION(jpi,jpj) :: z2d ! 2d workspace71 69 !!---------------------------------------------------------------------- 72 70 ! … … 87 85 ! !== isfdraft ==! 88 86 ! 89 ! the ocean basin surrounded by land (1 grid-point) set through lbc_lnk call as jperio=090 z2d(:,:) = 1._wp ! surface ocean is the 1st level91 CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. ) ! closed basin since jperio = 0 (see userdef_nam.F90)92 zmsk(:,:) = NINT( z2d(:,:) )93 !94 !95 87 zht (:,:) = rbathy 96 88 zhisf(:,:) = 200._wp 97 ij0 = 1 ; ij1 = 4089 ij0 = 1+1 ; ij1 = 40+1 ! + 1 for compatibility with old version. ==> to be removed 98 90 DO jj = mj0(ij0), mj1(ij1) 99 91 zhisf(:,jj)=700.0_wp-(gphit(:,jj)+80.0_wp)*125.0_wp 100 92 END DO 101 zhisf(:,:) = zhisf(:,:) * zmsk(:,:)102 93 ! 103 94 CALL zgr_z1d( pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d ) ! Reference z-coordinate system -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90
r12939 r13065 84 84 WRITE(numout,*) ' vertical resolution rn_dz = ', rn_dz, ' meters' 85 85 WRITE(numout,*) ' LOCK_EXCHANGE domain = 64 km x 3 grid-points x 20 m' 86 WRITE(numout,*) ' resulting global domain size : jpiglo = ', kpi87 WRITE(numout,*) ' jpjglo = ', kpj86 WRITE(numout,*) ' resulting global domain size : Ni0glo = ', kpi 87 WRITE(numout,*) ' Nj0glo = ', kpj 88 88 WRITE(numout,*) ' jpkglo = ', kpk 89 89 WRITE(numout,*) ' ' -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/OVERFLOW/MY_SRC/usrdef_nam.F90
r12939 r13065 85 85 WRITE(numout,*) ' vertical resolution rn_dz = ', rn_dz, ' meters' 86 86 WRITE(numout,*) ' OVERFLOW domain = 200 km x 3 grid-points x 2000 m' 87 WRITE(numout,*) ' resulting global domain size : jpiglo = ', kpi88 WRITE(numout,*) ' jpjglo = ', kpj87 WRITE(numout,*) ' resulting global domain size : Ni0glo = ', kpi 88 WRITE(numout,*) ' Nj0glo = ', kpj 89 89 WRITE(numout,*) ' jpkglo = ', kpk 90 90 ! -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/VORTEX/MY_SRC/usrdef_hgr.F90
r12960 r13065 77 77 ! Position coordinates (in kilometers) 78 78 ! ========== 79 zlam0 = -REAL(Ni0glo-1)/2, wp) * 1.e-3 * rn_dx 80 zphi0 = -REAL(Nj0glo-1)/2, wp) * 1.e-3 * rn_dy 81 79 #if defined key_agrif 80 IF( Agrif_Root() ) THEN 81 #endif 82 ! Compatibility WITH old version: 83 ! jperio = 0 => Ni0glo = jpigo_old_version 84 ! => jpiglo-1 replaced by Ni0glo-1 85 zlam0 = -REAL( (Ni0glo-1)/2, wp) * 1.e-3 * rn_dx 86 zphi0 = -REAL( (Nj0glo-1)/2, wp) * 1.e-3 * rn_dy 82 87 #if defined key_agrif 83 ! ! let lower left longitude and latitude from parent 84 IF (.NOT.Agrif_root()) THEN 85 zlam0 = (0.5_wp-(Agrif_parent(jpiglo)-1)/2)*1.e-3*Agrif_irhox()*rn_dx & 86 &+(Agrif_Ix()+nbghostcells-1)*Agrif_irhox()*rn_dx*1.e-3-(0.5_wp+nbghostcells)*rn_dx*1.e-3 87 zphi0 = (0.5_wp-(Agrif_parent(jpjglo)-1)/2)*1.e-3*Agrif_irhoy()*rn_dy & 88 &+(Agrif_Iy()+nbghostcells-1)*Agrif_irhoy()*rn_dy*1.e-3-(0.5_wp+nbghostcells)*rn_dy*1.e-3 88 ELSE 89 ! ! let lower left longitude and latitude from parent 90 ! Compatibility WITH old version: 91 ! jperio = 0 => Ni0glo = jpigo_old_version 92 ! => Agrif_parent(jpiglo)-1 replaced by Agrif_parent(Ni0glo)-1 93 zlam0 = ( 0.5_wp - REAL( ( Agrif_parent(Ni0glo)-1 ) / 2, wp) ) * 1.e-3 * Agrif_irhox() * rn_dx & 94 & + ( Agrif_Ix() + nbghostcells - 1 ) * Agrif_irhox() * rn_dx * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dx * 1.e-3 95 zphi0 = ( 0.5_wp - REAL( ( Agrif_parent(Nj0glo)-1 ) / 2, wp) ) * 1.e-3 * Agrif_irhoy() * rn_dy & 96 & + ( Agrif_Iy() + nbghostcells - 1 ) * Agrif_irhoy() * rn_dy * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dy * 1.e-3 89 97 ENDIF 90 98 #endif -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/VORTEX/MY_SRC/usrdef_nam.F90
r12939 r13065 85 85 kpj = NINT( 1800.e3 / rn_dy ) + 3 86 86 ELSE 87 kpi = nbcellsx + 2 + 2*nbghostcells88 kpj = nbcellsy + 2 + 2*nbghostcells87 kpi = nbcellsx + 2 * ( nbghostcells + 1 ) ! Global Domain size: add nbghostcells + 1 "land" point on each side 88 kpj = nbcellsy + 2 * ( nbghostcells + 1 ) 89 89 ENDIF 90 90 kpk = NINT( 5000._wp / rn_dz ) + 1 … … 104 104 WRITE(numout,*) ' horizontal resolution rn_dy = ', rn_dy, ' m' 105 105 WRITE(numout,*) ' vertical resolution rn_dz = ', rn_dz, ' m' 106 WRITE(numout,*) ' resulting global domain size : Ni0glo = ', kpi 107 WRITE(numout,*) ' Nj0glo = ', kpj 108 WRITE(numout,*) ' jpkglo = ', kpk 106 109 WRITE(numout,*) ' VORTEX domain: ' 107 110 WRITE(numout,*) ' LX [km]: ', zlx -
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/WAD/MY_SRC/usrdef_nam.F90
r12939 r13065 76 76 ! ! Set the lateral boundary condition of the global domain 77 77 kperio = 0 ! WAD_TEST_CASES configuration : closed domain 78 IF( nn_wad_test == 8 ) kperio = 7 ! North-South cyclic test 78 IF( nn_wad_test == 8 ) THEN 79 kperio = 7 ! North-South cyclic test 80 kpi = kpi - 2 ! no closed boundary 81 kpj = kpj - 2 ! no closed boundary 82 ENDIF 79 83 ! 80 84 ! ! control print
Note: See TracChangeset
for help on using the changeset viewer.
