Changeset 12377 for NEMO/trunk/src/OCE/ICB
- Timestamp:
- 2020-02-12T15:39:06+01:00 (4 years ago)
- Location:
- NEMO/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev @HEAD ext/AGRIF5 ^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL
-
- Property svn:externals
-
NEMO/trunk/src/OCE/ICB/icbclv.F90
r10714 r12377 32 32 PUBLIC icb_clv ! routine called in icbstp.F90 module 33 33 34 !! * Substitutions 35 # include "do_loop_substitute.h90" 34 36 !!---------------------------------------------------------------------- 35 37 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 69 71 ! where (berg_grid%calving==0.) berg_grid%stored_ice(:,:,jn)=0. 70 72 !end do 71 DO jj = 2, jpjm1 72 DO ji = 2, jpim1 73 IF( berg_grid%calving(ji,jj) /= 0._wp ) & ! Need units of J 74 berg_grid%stored_heat(ji,jj) = SUM( berg_grid%stored_ice(ji,jj,:) ) * & ! initial stored ice in kg 75 & berg_grid%calving_hflx(ji,jj) * e1e2t(ji,jj) / berg_grid%calving(ji,jj) ! J/s/m2 x m^2 76 ! ! = J/s/calving in kg/s 77 END DO 78 END DO 73 DO_2D_00_00 74 IF( berg_grid%calving(ji,jj) /= 0._wp ) & ! Need units of J 75 berg_grid%stored_heat(ji,jj) = SUM( berg_grid%stored_ice(ji,jj,:) ) * & ! initial stored ice in kg 76 & berg_grid%calving_hflx(ji,jj) * e1e2t(ji,jj) / berg_grid%calving(ji,jj) ! J/s/m2 x m^2 77 ! ! = J/s/calving in kg/s 78 END_2D 79 79 ENDIF 80 80 81 81 ! assume that all calving flux must be distributed even if distribution array does not sum 82 82 ! to one - this may not be what is intended, but it's what you've got 83 DO jj = 1, jpj 84 DO ji = 1, jpi 85 imx = berg_grid%maxclass(ji,jj) 86 zdist = SUM( rn_distribution(1:nclasses) ) / SUM( rn_distribution(1:imx) ) 87 DO jn = 1, imx 88 berg_grid%stored_ice(ji,jj,jn) = berg_grid%stored_ice(ji,jj,jn) & 89 & + berg_dt * berg_grid%calving(ji,jj) * rn_distribution(jn) * zdist 90 END DO 83 DO_2D_11_11 84 imx = berg_grid%maxclass(ji,jj) 85 zdist = SUM( rn_distribution(1:nclasses) ) / SUM( rn_distribution(1:imx) ) 86 DO jn = 1, imx 87 berg_grid%stored_ice(ji,jj,jn) = berg_grid%stored_ice(ji,jj,jn) & 88 & + berg_dt * berg_grid%calving(ji,jj) * rn_distribution(jn) * zdist 91 89 END DO 92 END DO90 END_2D 93 91 94 92 ! before changing the calving, save the amount we're about to use and do budget -
NEMO/trunk/src/OCE/ICB/icbini.F90
r11536 r12377 39 39 TYPE(FLD), PUBLIC, ALLOCATABLE , DIMENSION(:) :: sf_icb !: structure: file information, fields read 40 40 !: used in icbini and icbstp 41 !! * Substitutions 42 # include "do_loop_substitute.h90" 41 43 !!---------------------------------------------------------------------- 42 44 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 121 123 nicbfldproc(:) = -1 122 124 123 DO jj = 1, jpj 124 DO ji = 1, jpi 125 src_calving_hflx(ji,jj) = narea 126 src_calving (ji,jj) = nicbpack * mjg(jj) + mig(ji) 127 END DO 128 END DO 125 DO_2D_11_11 126 src_calving_hflx(ji,jj) = narea 127 src_calving (ji,jj) = nicbpack * mjg(jj) + mig(ji) 128 END_2D 129 129 CALL lbc_lnk( 'icbini', src_calving_hflx, 'T', 1._wp ) 130 130 CALL lbc_lnk( 'icbini', src_calving , 'T', 1._wp ) … … 404 404 #endif 405 405 ! !== read namelist ==! 406 REWIND( numnam_ref ) ! Namelist namberg in reference namelist : Iceberg parameters407 406 READ ( numnam_ref, namberg, IOSTAT = ios, ERR = 901) 408 407 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namberg in reference namelist' ) 409 REWIND( numnam_cfg ) ! Namelist namberg in configuration namelist : Iceberg parameters410 408 READ ( numnam_cfg, namberg, IOSTAT = ios, ERR = 902 ) 411 409 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namberg in configuration namelist' ) -
NEMO/trunk/src/OCE/ICB/icblbc.F90
r11536 r12377 63 63 PUBLIC icb_lbc_mpp 64 64 65 !! * Substitutions 66 # include "do_loop_substitute.h90" 65 67 !!---------------------------------------------------------------------- 66 68 !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Note: See TracChangeset
for help on using the changeset viewer.