Changeset 13766 for NEMO/branches/2020/dev_12905_xios_ancil/tests/ISOMIP+
- Timestamp:
- 2020-11-10T12:57:08+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/dev_12905_xios_ancil
- Files:
-
- 10 edited
-
. (modified) (1 prop)
-
tests/ISOMIP+/EXPREF/namelist_cfg (modified) (6 diffs)
-
tests/ISOMIP+/MY_SRC/dtatsd.F90 (modified) (2 diffs)
-
tests/ISOMIP+/MY_SRC/eosbn2.F90 (modified) (25 diffs)
-
tests/ISOMIP+/MY_SRC/isf_oce.F90 (modified) (1 diff)
-
tests/ISOMIP+/MY_SRC/isfcavgam.F90 (modified) (1 diff)
-
tests/ISOMIP+/MY_SRC/isfstp.F90 (modified) (7 diffs)
-
tests/ISOMIP+/MY_SRC/istate.F90 (modified) (12 diffs)
-
tests/ISOMIP+/MY_SRC/sbcfwb.F90 (modified) (5 diffs)
-
tests/ISOMIP+/MY_SRC/tradmp.F90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_12905_xios_ancil
- 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@13559 sette
-
- Property svn:externals
-
NEMO/branches/2020/dev_12905_xios_ancil/tests/ISOMIP+/EXPREF/namelist_cfg
r12905 r13766 261 261 !! !! 262 262 !! namdrg top/bottom drag coefficient (default: NO selection) 263 !! namdrg_top top friction (ln_ OFF=F & ln_isfcav=T)264 !! namdrg_bot bottom friction (ln_ OFF=F)263 !! namdrg_top top friction (ln_drg_OFF=F & ln_isfcav=T) 264 !! namdrg_bot bottom friction (ln_drg_OFF=F) 265 265 !! nambbc bottom temperature boundary condition (default: OFF) 266 266 !! nambbl bottom boundary layer scheme (default: OFF) … … 273 273 / 274 274 !----------------------------------------------------------------------- 275 &namdrg_top ! TOP friction (ln_ OFF =F & ln_isfcav=T)275 &namdrg_top ! TOP friction (ln_drg_OFF =F & ln_isfcav=T) 276 276 !----------------------------------------------------------------------- 277 277 rn_Cd0 = 2.5e-3 ! drag coefficient [-] … … 279 279 / 280 280 !----------------------------------------------------------------------- 281 &namdrg_bot ! BOTTOM friction (ln_ OFF =F)281 &namdrg_bot ! BOTTOM friction (ln_drg_OFF =F) 282 282 !----------------------------------------------------------------------- 283 283 rn_Cd0 = 2.5e-3 ! drag coefficient [-] … … 311 311 ! 312 312 ! ! S-EOS coefficients (ln_seos=T): 313 ! ! rd(T,S,Z)*r au0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS313 ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS 314 314 ! ! L-EOS coefficients (ln_seos=T): 315 ! ! rd(T,S,Z)*r au0 = rau0*(-a0*dT+b0*dS)315 ! ! rd(T,S,Z)*rho0 = rho0*(-a0*dT+b0*dS) 316 316 rn_a0 = 3.7330e-5 ! thermal expension coefficient 317 317 rn_b0 = 7.8430e-4 ! saline expension coefficient … … 461 461 !! !! 462 462 !! namtrd dynamics and/or tracer trends (default: OFF) 463 !! namptr Poleward Transport Diagnostics (default: OFF)464 463 !! namhsb Heat and salt budgets (default: OFF) 465 464 !! namdiu Cool skin and warm layer models (default: OFF) … … 478 477 / 479 478 !----------------------------------------------------------------------- 480 &namptr ! Poleward Transport Diagnostic (default: OFF)481 479 !----------------------------------------------------------------------- 482 480 / -
NEMO/branches/2020/dev_12905_xios_ancil/tests/ISOMIP+/MY_SRC/dtatsd.F90
r12905 r13766 191 191 ENDIF 192 192 ! 193 DO_2D _11_11193 DO_2D( 1, 1, 1, 1 ) ! vertical interpolation of T & S 194 194 DO jk = 1, jpk ! determines the intepolated T-S profiles at each (i,j) points 195 195 zl = gdept_0(ji,jj,jk) … … 224 224 ! 225 225 IF( ln_zps ) THEN ! zps-coordinate (partial steps) interpolation at the last ocean level 226 DO_2D _11_11226 DO_2D( 1, 1, 1, 1 ) 227 227 ik = mbkt(ji,jj) 228 228 IF( ik > 1 ) THEN -
NEMO/branches/2020/dev_12905_xios_ancil/tests/ISOMIP+/MY_SRC/eosbn2.F90
r12905 r13766 182 182 !! * Substitutions 183 183 # include "do_loop_substitute.h90" 184 # include "domzgr_substitute.h90" 184 185 !!---------------------------------------------------------------------- 185 186 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 243 244 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 244 245 ! 245 DO_3D _11_11(1, jpkm1 )246 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 246 247 ! 247 248 zh = pdep(ji,jj,jk) * r1_Z0 ! depth … … 279 280 CASE( np_seos ) !== simplified EOS ==! 280 281 ! 281 DO_3D _11_11(1, jpkm1 )282 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 282 283 zt = pts (ji,jj,jk,jp_tem) - 10._wp 283 284 zs = pts (ji,jj,jk,jp_sal) - 35._wp … … 294 295 CASE( np_leos ) !== linear ISOMIP EOS ==! 295 296 ! 296 DO_3D _11_11(1, jpkm1 )297 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 297 298 zt = pts (ji,jj,jk,jp_tem) - (-1._wp) 298 299 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp … … 356 357 END DO 357 358 ! 358 DO_3D _11_11(1, jpkm1 )359 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 359 360 ! 360 361 ! compute density (2*nn_sto_eos) times: … … 406 407 ! Non-stochastic equation of state 407 408 ELSE 408 DO_3D _11_11(1, jpkm1 )409 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 409 410 ! 410 411 zh = pdep(ji,jj,jk) * r1_Z0 ! depth … … 444 445 CASE( np_seos ) !== simplified EOS ==! 445 446 ! 446 DO_3D _11_11(1, jpkm1 )447 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 447 448 zt = pts (ji,jj,jk,jp_tem) - 10._wp 448 449 zs = pts (ji,jj,jk,jp_sal) - 35._wp … … 462 463 CASE( np_leos ) !== linear ISOMIP EOS ==! 463 464 ! 464 DO_3D _11_11(1, jpkm1 )465 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 465 466 zt = pts (ji,jj,jk,jp_tem) - (-1._wp) 466 467 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp … … 513 514 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 514 515 ! 515 DO_2D _11_11516 DO_2D( 1, 1, 1, 1 ) 516 517 ! 517 518 zh = pdep(ji,jj) * r1_Z0 ! depth … … 548 549 CASE( np_seos ) !== simplified EOS ==! 549 550 ! 550 DO_2D _11_11551 DO_2D( 1, 1, 1, 1 ) 551 552 ! 552 553 zt = pts (ji,jj,jp_tem) - 10._wp … … 564 565 CASE( np_leos ) !== ISOMIP EOS ==! 565 566 ! 566 DO_2D _11_11567 DO_2D( 1, 1, 1, 1 ) 567 568 ! 568 569 zt = pts (ji,jj,jp_tem) - (-1._wp) … … 611 612 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 612 613 ! 613 DO_3D _11_11(1, jpkm1 )614 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 614 615 ! 615 616 zh = gdept(ji,jj,jk,Kmm) * r1_Z0 ! depth … … 664 665 CASE( np_seos ) !== simplified EOS ==! 665 666 ! 666 DO_3D _11_11(1, jpkm1 )667 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 667 668 zt = pts (ji,jj,jk,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) 668 669 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) … … 680 681 CASE( np_leos ) !== linear ISOMIP EOS ==! 681 682 ! 682 DO_3D _11_11(1, jpkm1 )683 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 683 684 zt = pts (ji,jj,jk,jp_tem) - (-1._wp) 684 685 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp ! abs. salinity anomaly (s-S0) … … 734 735 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 735 736 ! 736 DO_2D _11_11737 DO_2D( 1, 1, 1, 1 ) 737 738 ! 738 739 zh = pdep(ji,jj) * r1_Z0 ! depth … … 787 788 CASE( np_seos ) !== simplified EOS ==! 788 789 ! 789 DO_2D _11_11790 DO_2D( 1, 1, 1, 1 ) 790 791 ! 791 792 zt = pts (ji,jj,jp_tem) - 10._wp ! pot. temperature anomaly (t-T0) … … 803 804 CASE( np_leos ) !== linear ISOMIP EOS ==! 804 805 ! 805 DO_2D _11_11806 DO_2D( 1, 1, 1, 1 ) 806 807 ! 807 808 zt = pts (ji,jj,jp_tem) - (-1._wp) ! pot. temperature anomaly (t-T0) … … 965 966 IF( ln_timing ) CALL timing_start('bn2') 966 967 ! 967 DO_3D _11_11( 2, jpkm1 )968 DO_3D( 1, 1, 1, 1, 2, jpkm1 ) ! interior points only (2=< jk =< jpkm1 ); surface and bottom value set to zero one for all in istate.F90 968 969 zrw = ( gdepw(ji,jj,jk ,Kmm) - gdept(ji,jj,jk,Kmm) ) & 969 970 & / ( gdept(ji,jj,jk-1,Kmm) - gdept(ji,jj,jk,Kmm) ) … … 1013 1014 z1_T0 = 1._wp/40._wp 1014 1015 ! 1015 DO_2D _11_111016 DO_2D( 1, 1, 1, 1 ) 1016 1017 ! 1017 1018 zt = ctmp (ji,jj) * z1_T0 … … 1066 1067 ! 1067 1068 z1_S0 = 1._wp / 35.16504_wp 1068 DO_2D _11_111069 DO_2D( 1, 1, 1, 1 ) 1069 1070 zs= SQRT( ABS( psal(ji,jj) ) * z1_S0 ) ! square root salinity 1070 1071 ptf(ji,jj) = ((((1.46873e-03_wp*zs-9.64972e-03_wp)*zs+2.28348e-02_wp)*zs & … … 1173 1174 CASE( np_teos10, np_eos80 ) !== polynomial TEOS-10 / EOS-80 ==! 1174 1175 ! 1175 DO_3D _11_11(1, jpkm1 )1176 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 1176 1177 ! 1177 1178 zh = gdept(ji,jj,jk,Kmm) * r1_Z0 ! depth … … 1232 1233 CASE( np_seos ) !== Vallis (2006) simplified EOS ==! 1233 1234 ! 1234 DO_3D _11_11(1, jpkm1 )1235 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 1235 1236 zt = pts(ji,jj,jk,jp_tem) - 10._wp ! temperature anomaly (t-T0) 1236 1237 zs = pts (ji,jj,jk,jp_sal) - 35._wp ! abs. salinity anomaly (s-S0) … … 1248 1249 CASE( np_leos ) !== linear ISOMIP EOS ==! 1249 1250 ! 1250 DO_3D _11_11(1, jpkm1 )1251 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 1251 1252 zt = pts(ji,jj,jk,jp_tem) - (-1._wp) ! temperature anomaly (t-T0) 1252 1253 zs = pts (ji,jj,jk,jp_sal) - 34.2_wp ! abs. salinity anomaly (s-S0) … … 1723 1724 ! 1724 1725 CASE( np_leos ) !== Linear ISOMIP EOS ==! 1726 1727 r1_S0 = 0.875_wp/35.16504_wp ! Used to convert CT in potential temperature when using bulk formulae (eos_pt_from_ct) 1728 1725 1729 IF(lwp) THEN 1726 1730 WRITE(numout,*) … … 1731 1735 WRITE(numout,*) ' saline cont. coef. rn_b0 = ', rn_b0 1732 1736 ENDIF 1737 l_useCT = .TRUE. ! Use conservative temperature 1733 1738 ! 1734 1739 CASE DEFAULT !== ERROR in neos ==! -
NEMO/branches/2020/dev_12905_xios_ancil/tests/ISOMIP+/MY_SRC/isf_oce.F90
r12077 r13766 75 75 ! 76 76 ! 2.1 -------- ice shelf cavity parameter -------------- 77 LOGICAL , PUBLIC :: l_isfoasis 77 LOGICAL , PUBLIC :: l_isfoasis = .FALSE. 78 78 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: risfload !: ice shelf load 79 79 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: fwfisf_oasis -
NEMO/branches/2020/dev_12905_xios_ancil/tests/ISOMIP+/MY_SRC/isfcavgam.F90
r12905 r13766 30 30 PUBLIC isfcav_gammats 31 31 32 # include "domzgr_substitute.h90" 32 33 !!---------------------------------------------------------------------- 33 34 !! NEMO/OCE 4.0 , NEMO Consortium (2018) -
NEMO/branches/2020/dev_12905_xios_ancil/tests/ISOMIP+/MY_SRC/isfstp.F90
r12905 r13766 13 13 !! isfstp : compute iceshelf melt and heat flux 14 14 !!---------------------------------------------------------------------- 15 !16 15 USE isf_oce ! isf variables 17 16 USE isfload, ONLY: isf_load ! ice shelf load … … 21 20 USE isfcpl , ONLY: isfcpl_rst_write, isfcpl_init ! isf variables 22 21 23 USE dom_oce, ONLY: ht, e3t, ln_isfcav, ln_linssh ! ocean space and time domain 22 USE dom_oce ! ocean space and time domain 23 USE oce , ONLY: ssh ! sea surface height 24 24 USE domvvl, ONLY: ln_vvl_zstar ! zstar logical 25 25 USE zdfdrg, ONLY: r_Cdmin_top, r_ke0_top ! vertical physics: top/bottom drag coef. … … 31 31 32 32 IMPLICIT NONE 33 34 33 PRIVATE 35 34 36 35 PUBLIC isf_stp, isf_init, isf_nam ! routine called in sbcmod and divhor 37 36 37 !! * Substitutions 38 # include "domzgr_substitute.h90" 38 39 !!---------------------------------------------------------------------- 39 40 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 41 42 !! Software governed by the CeCILL license (see ./LICENSE) 42 43 !!---------------------------------------------------------------------- 44 43 45 CONTAINS 44 46 … … 60 62 INTEGER, INTENT(in) :: kt ! ocean time step 61 63 INTEGER, INTENT(in) :: Kmm ! ocean time level index 64 !!---------------------------------------------------------------------- 65 INTEGER :: jk ! loop index 66 REAL(wp), DIMENSION(jpi,jpj,jpk) :: ze3t ! e3t 62 67 !!--------------------------------------------------------------------- 63 68 ! … … 78 83 ! 1.2: compute misfkb, rhisf_tbl, rfrac (deepest level, thickness, fraction of deepest cell affected by tbl) 79 84 rhisf_tbl_cav(:,:) = rn_htbl * mskisf_cav(:,:) 80 CALL isf_tbl_lvl(ht, e3t(:,:,:,Kmm), misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav) 85 DO jk = 1, jpk 86 ze3t(:,:,jk) = e3t(:,:,jk,Kmm) 87 END DO 88 CALL isf_tbl_lvl(ht(:,:), ze3t, misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav) 81 89 ! 82 90 ! 1.3: compute ice shelf melt … … 100 108 ! by simplicity, we assume the top level where param applied do not change with time (done in init part) 101 109 rhisf_tbl_par(:,:) = rhisf0_tbl_par(:,:) 102 CALL isf_tbl_lvl(ht, e3t(:,:,:,Kmm), misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par) 110 DO jk = 1, jpk 111 ze3t(:,:,jk) = e3t(:,:,jk,Kmm) 112 END DO 113 CALL isf_tbl_lvl(ht(:,:), ze3t, misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par) 103 114 ! 104 115 ! 2.3: compute ice shelf melt -
NEMO/branches/2020/dev_12905_xios_ancil/tests/ISOMIP+/MY_SRC/istate.F90
r12905 r13766 24 24 USE dom_oce ! ocean space and time domain 25 25 USE daymod ! calendar 26 USE divhor ! horizontal divergence (div_hor routine)27 26 USE dtatsd ! data temperature and salinity (dta_tsd routine) 28 27 USE dtauvd ! data: U & V current (dta_uvd routine) … … 35 34 USE lib_mpp ! MPP library 36 35 USE restart ! restart 36 #if defined key_agrif 37 USE agrif_oce_interp 38 USE agrif_oce 39 #endif 37 40 38 41 IMPLICIT NONE … … 43 46 !! * Substitutions 44 47 # include "do_loop_substitute.h90" 48 # include "domzgr_substitute.h90" 45 49 !!---------------------------------------------------------------------- 46 50 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 59 63 ! 60 64 INTEGER :: ji, jj, jk ! dummy loop indices 65 REAL(wp), DIMENSION(jpi,jpj,jpk) :: zgdept ! 3D table !!st patch to use gdept subtitute 61 66 !!gm see comment further down 62 67 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) :: zuvd ! U & V data workspace … … 70 75 !!gm Why not include in the first call of dta_tsd ? 71 76 !!gm probably associated with the use of internal damping... 72 77 CALL dta_tsd_init ! Initialisation of T & S input data 73 78 !!gm to be moved in usrdef of C1D case 74 79 ! IF( lk_c1d ) CALL dta_uvd_init ! Initialization of U & V input data … … 84 89 #endif 85 90 91 #if defined key_agrif 92 IF ( (.NOT.Agrif_root()).AND.ln_init_chfrpar ) THEN 93 numror = 0 ! define numror = 0 -> no restart file to read 94 ln_1st_euler = .true. ! Set time-step indicator at nit000 (euler forward) 95 CALL day_init 96 CALL agrif_istate( Kbb, Kmm, Kaa ) ! Interp from parent 97 ! 98 ts (:,:,:,:,Kmm) = ts (:,:,:,:,Kbb) 99 ssh (:,:,Kmm) = ssh(:,:,Kbb) 100 uu (:,:,:,Kmm) = uu (:,:,:,Kbb) 101 vv (:,:,:,Kmm) = vv (:,:,:,Kbb) 102 ELSE 103 #endif 86 104 IF( ln_rstart ) THEN ! Restart from a file 87 105 ! ! ------------------- … … 100 118 ! 101 119 ssh(:,:,Kbb) = 0._wp ! set the ocean at rest 120 uu (:,:,:,Kbb) = 0._wp 121 vv (:,:,:,Kbb) = 0._wp 122 ! 102 123 IF( ll_wd ) THEN 103 124 ssh(:,:,Kbb) = -ssh_ref ! Added in 30 here for bathy that adds 30 as Iterative test CEOD … … 105 126 ! Apply minimum wetdepth criterion 106 127 ! 107 DO_2D _11_11128 DO_2D( 1, 1, 1, 1 ) 108 129 IF( ht_0(ji,jj) + ssh(ji,jj,Kbb) < rn_wdmin1 ) THEN 109 130 ssh(ji,jj,Kbb) = tmask(ji,jj,1)*( rn_wdmin1 - (ht_0(ji,jj)) ) … … 111 132 END_2D 112 133 ENDIF 113 uu (:,:,:,Kbb) = 0._wp 114 vv (:,:,:,Kbb) = 0._wp 115 ! 134 ! 116 135 ELSE ! user defined initial T and S 117 CALL usr_def_istate( gdept(:,:,:,Kbb), tmask, ts(:,:,:,:,Kbb), uu(:,:,:,Kbb), vv(:,:,:,Kbb), ssh(:,:,Kbb) ) 136 DO jk = 1, jpk 137 zgdept(:,:,jk) = gdept(:,:,jk,Kbb) 138 END DO 139 CALL usr_def_istate( zgdept, tmask, ts(:,:,:,:,Kbb), uu(:,:,:,Kbb), vv(:,:,:,Kbb), ssh(:,:,Kbb) ) 118 140 ENDIF 119 141 ts (:,:,:,:,Kmm) = ts (:,:,:,:,Kbb) ! set now values from to before ones … … 121 143 uu (:,:,:,Kmm) = uu (:,:,:,Kbb) 122 144 vv (:,:,:,Kmm) = vv (:,:,:,Kbb) 123 hdiv(:,:,jpk) = 0._wp ! bottom divergence set one for 0 to zero at jpk level124 CALL div_hor( 0, Kbb, Kmm ) ! compute interior hdiv value125 !!gm hdiv(:,:,:) = 0._wp126 145 127 146 !!gm POTENTIAL BUG : 128 147 !!gm ISSUE : if ssh(:,:,Kbb) /= 0 then, in non linear free surface, the e3._n, e3._b should be recomputed 129 !! as well as gdept and gdepw.... !!!!!148 !! as well as gdept_ and gdepw_.... !!!!! 130 149 !! ===>>>> probably a call to domvvl initialisation here.... 131 150 … … 151 170 ! 152 171 ENDIF 172 #if defined key_agrif 173 ENDIF 174 #endif 153 175 ! 154 176 ! Initialize "now" and "before" barotropic velocities: … … 159 181 ! 160 182 !!gm the use of umsak & vmask is not necessary below as uu(:,:,:,Kmm), vv(:,:,:,Kmm), uu(:,:,:,Kbb), vv(:,:,:,Kbb) are always masked 161 DO_3D _11_11(1, jpkm1 )183 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 162 184 uu_b(ji,jj,Kmm) = uu_b(ji,jj,Kmm) + e3u(ji,jj,jk,Kmm) * uu(ji,jj,jk,Kmm) * umask(ji,jj,jk) 163 185 vv_b(ji,jj,Kmm) = vv_b(ji,jj,Kmm) + e3v(ji,jj,jk,Kmm) * vv(ji,jj,jk,Kmm) * vmask(ji,jj,jk) -
NEMO/branches/2020/dev_12905_xios_ancil/tests/ISOMIP+/MY_SRC/sbcfwb.F90
r12905 r13766 17 17 USE dom_oce ! ocean space and time domain 18 18 USE sbc_oce ! surface ocean boundary condition 19 USE isf_oce 19 USE isf_oce , ONLY : fwfisf_cav, fwfisf_par, ln_isfcpl, ln_isfcpl_cons, risfcpl_cons_ssh ! ice shelf melting contribution 20 20 USE sbc_ice , ONLY : snwice_mass, snwice_mass_b, snwice_fmass 21 21 USE phycst ! physical constants … … 71 71 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: ztmsk_tospread, zerp_cor ! - - 72 72 REAL(wp) ,DIMENSION(1) :: z_fwfprv 73 COMPLEX( wp),DIMENSION(1) :: y_fwfnow73 COMPLEX(dp),DIMENSION(1) :: y_fwfnow 74 74 !!---------------------------------------------------------------------- 75 75 ! … … 95 95 snwice_mass_b(:,:) = 0.e0 ! no sea-ice model is being used : no snow+ice mass 96 96 snwice_mass (:,:) = 0.e0 97 snwice_fmass (:,:) = 0.e0 97 98 #endif 98 99 ! … … 205 206 ! 206 207 !!gm ===>>>> lbc_lnk should be useless as all the computation is done over the whole domain ! 207 CALL lbc_lnk( 'sbcfwb', zerp_cor, 'T', 1. )208 CALL lbc_lnk( 'sbcfwb', zerp_cor, 'T', 1.0_wp ) 208 209 ! 209 210 emp(:,:) = emp(:,:) + zerp_cor(:,:) … … 211 212 erp(:,:) = erp(:,:) + zerp_cor(:,:) 212 213 ! 213 IF( nprint == 1 .AND.lwp ) THEN ! control print214 IF( lwp ) THEN ! control print 214 215 IF( z_fwf < 0._wp ) THEN 215 216 WRITE(numout,*)' z_fwf < 0' -
NEMO/branches/2020/dev_12905_xios_ancil/tests/ISOMIP+/MY_SRC/tradmp.F90
r12905 r13766 112 112 CASE( 0 ) !* newtonian damping throughout the water column *! 113 113 DO jn = 1, jpts 114 DO_3D _00_00(1, jpkm1 )114 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 115 115 pts(ji,jj,jk,jn,Krhs) = pts(ji,jj,jk,jn,Krhs) & 116 116 & + resto(ji,jj,jk) * ( zts_dta(ji,jj,jk,jn) - pts(ji,jj,jk,jn,Kbb) ) … … 119 119 ! 120 120 CASE ( 1 ) !* no damping in the turbocline (avt > 5 cm2/s) *! 121 DO_3D _00_00(1, jpkm1 )121 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 122 122 IF( avt(ji,jj,jk) <= avt_c ) THEN 123 123 pts(ji,jj,jk,jp_tem,Krhs) = pts(ji,jj,jk,jp_tem,Krhs) & … … 129 129 ! 130 130 CASE ( 2 ) !* no damping in the mixed layer *! 131 DO_3D _00_00(1, jpkm1 )131 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 132 132 IF( gdept(ji,jj,jk,Kmm) >= hmlp (ji,jj) ) THEN 133 133 pts(ji,jj,jk,jp_tem,Krhs) = pts(ji,jj,jk,jp_tem,Krhs) & … … 208 208 ! ! Read in mask from file 209 209 CALL iom_open ( cn_resto, imask) 210 CALL iom_get ( imask, jpdom_auto glo, 'resto', resto )210 CALL iom_get ( imask, jpdom_auto, 'resto', resto ) 211 211 CALL iom_close( imask ) 212 212 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.
