- Timestamp:
- 2019-12-11T10:18:26+01:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfcpl.F90
r12062 r12169 476 476 INTEGER :: iig , ijg, ik ! dummy indices 477 477 INTEGER :: jisf ! start, end and current position in the increment array 478 INTEGER :: ingb, ifind ! 0/1 target found or need to be found479 478 INTEGER :: ingb, ifind, nisfl_area ! global number of cell concerned by the wet->dry case 480 479 INTEGER, DIMENSION(jpnij) :: nisfl ! local number of cell concerned by the wet->dry case -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfutils.F90
r12062 r12169 40 40 REAL(wp), DIMENSION(jpi,jpj), INTENT( out) :: pvar ! output variable 41 41 !!-------------------------- IN ------------------------------------- 42 CHARACTER(len= 256) , INTENT(in ) :: cdfile ! input file name43 CHARACTER(len= 34) , INTENT(in ) :: cdvar ! variable name42 CHARACTER(len=*) , INTENT(in ) :: cdfile ! input file name 43 CHARACTER(len=*) , INTENT(in ) :: cdvar ! variable name 44 44 !!-------------------------------------------------------------------- 45 45 INTEGER :: inum … … 59 59 !! 60 60 !!-------------------------- IN ------------------------------------- 61 CHARACTER(LEN= 256) , INTENT(in ) :: cdtxt61 CHARACTER(LEN=*) , INTENT(in ) :: cdtxt 62 62 REAL(wp), DIMENSION(jpi,jpj), INTENT(in ) :: pvar 63 63 !!-------------------------------------------------------------------- … … 101 101 !! 102 102 !!-------------------------- IN ------------------------------------- 103 CHARACTER(LEN= 256) , INTENT(in ) :: cdtxt103 CHARACTER(LEN=*) , INTENT(in ) :: cdtxt 104 104 REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in ) :: pvar 105 105 !!-------------------------------------------------------------------- -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcmod.F90
r12166 r12169 96 96 & nn_ice , ln_ice_embd, & 97 97 & ln_traqsr, ln_dm2dc , & 98 & ln_rnf , nn_fwb , ln_ssr , ln_ isf , ln_apr_dyn , &98 & ln_rnf , nn_fwb , ln_ssr , ln_apr_dyn , & 99 99 & ln_wave , ln_cdgw , ln_sdw , ln_tauwoc , ln_stcor , & 100 100 & ln_tauw , nn_lsm, nn_sdrift … … 244 244 #endif 245 245 ! 246 IF( .NOT.ln_isf ) THEN !* No ice-shelf in the domain : allocate and set to zero247 IF( sbc_isf_alloc() /= 0 ) CALL ctl_stop( 'STOP', 'sbc_init : unable to allocate sbc_isf arrays' )248 fwfisf (:,:) = 0._wp ; risf_tsc (:,:,:) = 0._wp249 fwfisf_b(:,:) = 0._wp ; risf_tsc_b(:,:,:) = 0._wp250 ENDIF251 !252 246 IF( sbc_ssr_alloc() /= 0 ) CALL ctl_stop( 'STOP', 'sbc_init : unable to allocate sbc_ssr arrays' ) 253 247 IF( .NOT.ln_ssr ) THEN !* Initialize qrp and erp if no restoring -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TRA/tranxt.F90
r12166 r12169 330 330 ENDIF 331 331 ! 332 ! 333 ! solar penetration (temperature only) 334 IF( ll_traqsr .AND. jn == jp_tem .AND. jk <= nksr ) & 335 & ztc_f = ztc_f - zfact1 * ( qsr_hc(ji,jj,jk) - qsr_hc_b(ji,jj,jk) ) 336 ! 332 337 IF( ll_rnf .AND. jk <= nk_rnf(ji,jj) ) & 333 338 & ztc_f = ztc_f - zfact1 * ( rnf_tsc(ji,jj,jn) - rnf_tsc_b(ji,jj,jn) ) & 334 339 & * e3t_n(ji,jj,jk) / h_rnf(ji,jj) 335 ! 336 ! solar penetration (temperature only) 337 IF( ll_traqsr .AND. jn == jp_tem .AND. jk <= nksr ) & 338 & ztc_f = ztc_f - zfact1 * ( qsr_hc(ji,jj,jk) - qsr_hc_b(ji,jj,jk) ) 339 ! 340 340 341 ! ice shelf 341 342 IF( ll_isf ) THEN
Note: See TracChangeset
for help on using the changeset viewer.