Changeset 13766 for NEMO/branches/2020/dev_12905_xios_ancil/src/OCE/C1D
- Timestamp:
- 2020-11-10T12:57:08+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/dev_12905_xios_ancil
- Files:
-
- 5 edited
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/src/OCE/C1D/dtauvd.F90
r12377 r13766 158 158 ENDIF 159 159 ! 160 DO_2D _11_11160 DO_2D( 1, 1, 1, 1 ) ! vertical interpolation of U & V current: 161 161 DO jk = 1, jpk 162 162 zl = gdept(ji,jj,jk,Kmm) … … 193 193 ! 194 194 IF( ln_zps ) THEN ! zps-coordinate (partial steps) interpolation at the last ocean level 195 DO_2D _11_11195 DO_2D( 1, 1, 1, 1 ) 196 196 ik = mbkt(ji,jj) 197 197 IF( ik > 1 ) THEN -
NEMO/branches/2020/dev_12905_xios_ancil/src/OCE/C1D/dyncor_c1d.F90
r12377 r13766 77 77 ! 78 78 IF( ln_stcor ) THEN 79 DO_3D _00_00(1, jpkm1 )79 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 80 80 puu(ji,jj,jk,Krhs) = puu(ji,jj,jk,Krhs) + ff_t(ji,jj) * (pvv(ji,jj,jk,Kmm) + vsd(ji,jj,jk)) 81 81 pvv(ji,jj,jk,Krhs) = pvv(ji,jj,jk,Krhs) - ff_t(ji,jj) * (puu(ji,jj,jk,Kmm) + usd(ji,jj,jk)) 82 82 END_3D 83 83 ELSE 84 DO_3D _00_00(1, jpkm1 )84 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 85 85 puu(ji,jj,jk,Krhs) = puu(ji,jj,jk,Krhs) + ff_t(ji,jj) * pvv(ji,jj,jk,Kmm) 86 86 pvv(ji,jj,jk,Krhs) = pvv(ji,jj,jk,Krhs) - ff_t(ji,jj) * puu(ji,jj,jk,Kmm) -
NEMO/branches/2020/dev_12905_xios_ancil/src/OCE/C1D/dyndmp.F90
r12377 r13766 121 121 !Read in mask from file 122 122 CALL iom_open ( cn_resto, imask) 123 CALL iom_get ( imask, jpdom_auto glo, 'resto', resto)123 CALL iom_get ( imask, jpdom_auto, 'resto', resto) 124 124 CALL iom_close( imask ) 125 125 ENDIF … … 165 165 ! 166 166 CASE( 0 ) ! Newtonian damping throughout the water column 167 DO_3D _00_00(1, jpkm1 )167 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 168 168 zua = resto_uv(ji,jj,jk) * ( zuv_dta(ji,jj,jk,1) - puu(ji,jj,jk,Kbb) ) 169 169 zva = resto_uv(ji,jj,jk) * ( zuv_dta(ji,jj,jk,2) - pvv(ji,jj,jk,Kbb) ) … … 175 175 ! 176 176 CASE ( 1 ) ! no damping above the turbocline (avt > 5 cm2/s) 177 DO_3D _00_00(1, jpkm1 )177 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 178 178 IF( avt(ji,jj,jk) <= avt_c ) THEN 179 179 zua = resto_uv(ji,jj,jk) * ( zuv_dta(ji,jj,jk,1) - puu(ji,jj,jk,Kbb) ) … … 190 190 ! 191 191 CASE ( 2 ) ! no damping in the mixed layer 192 DO_3D _00_00(1, jpkm1 )192 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 193 193 IF( gdept(ji,jj,jk,Kmm) >= hmlp (ji,jj) ) THEN 194 194 zua = resto_uv(ji,jj,jk) * ( zuv_dta(ji,jj,jk,1) - puu(ji,jj,jk,Kbb) ) -
NEMO/branches/2020/dev_12905_xios_ancil/src/OCE/C1D/step_c1d.F90
r12740 r13766 56 56 ! 57 57 INTEGER :: jk ! dummy loop indice 58 INTEGER :: indic ! error indicator if < 059 58 !! --------------------------------------------------------------------- 60 61 indic = 0 ! reset to no error condition62 59 IF( kstp == nit000 ) CALL iom_init( "nemo") ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 63 60 IF( kstp /= nit000 ) CALL day( kstp ) ! Calendar (day was already called at nit000 in day_init) … … 83 80 IF(.NOT.ln_linssh ) CALL dom_vvl_sf_nxt( kstp, Nbb, Nnn, Naa ) ! after vertical scale factors 84 81 85 IF(.NOT.ln_linssh ) CALL wzv ( kstp, Nbb, Nnn, ww, Naa) ! now cross-level velocity82 IF(.NOT.ln_linssh ) CALL wzv ( kstp, Nbb, Nnn, Naa, ww ) ! now cross-level velocity 86 83 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 87 84 ! diagnostics and outputs … … 137 134 ! Control and restarts 138 135 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 139 CALL stp_ctl( kstp, N bb, Nnn, indic)136 CALL stp_ctl( kstp, Nnn ) 140 137 IF( kstp == nit000 ) CALL iom_close( numror ) ! close input ocean restart file 141 138 IF( lrst_oce ) CALL rst_write( kstp, Nbb, Nnn ) ! write output ocean restart file 142 139 ! 143 140 #if defined key_iomput 144 IF( kstp == nitend .OR. indic <0 ) CALL xios_context_finalize() ! needed for XIOS141 IF( kstp == nitend .OR. nstop > 0 ) CALL xios_context_finalize() ! needed for XIOS 145 142 ! 146 143 #endif
Note: See TracChangeset
for help on using the changeset viewer.