- Timestamp:
- 2019-08-08T19:15:24+02:00 (5 years ago)
- Location:
- NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcavmlt.F90
r11423 r11425 57 57 SELECT CASE ( cn_isfcav_mlt ) 58 58 CASE ( 'spe' ) ! ice shelf melt specified (read input file, and heat fluxes derived from 59 CALL isf mlt_spe( kt, pstbl, &59 CALL isfcav_mlt_spe( kt, pstbl, & 60 60 & pqhc, pqoce, pqfwf ) 61 61 CASE ( '2eq' ) ! ISOMIP formulation (2 equations) for volume flux (Hunter et al., 2006) 62 CALL isf mlt_2eq( pgt, pttbl, pstbl, &62 CALL isfcav_mlt_2eq( pgt, pttbl, pstbl, & 63 63 & pqhc , pqoce, pqfwf ) 64 64 CASE ( '3eq' ) ! ISOMIP+ formulation (3 equations) for volume flux (Asay-Davis et al., 2015) 65 CALL isf mlt_3eq( pgt, pgs , pttbl, pstbl, &65 CALL isfcav_mlt_3eq( pgt, pgs , pttbl, pstbl, & 66 66 & pqhc, pqoce, pqfwf ) 67 67 CASE ( 'oasis' ) ! fwf pass trough oasis 68 CALL isf mlt_oasis( kt, pstbl, &68 CALL isfcav_mlt_oasis( kt, pstbl, & 69 69 & pqhc, pqoce, pqfwf ) 70 70 CASE DEFAULT … … 78 78 ! ------------------------------------------------------------------------------------------------------- 79 79 80 SUBROUTINE isf mlt_spe(kt, pstbl, & ! <<== in80 SUBROUTINE isfcav_mlt_spe(kt, pstbl, & ! <<== in 81 81 & pqhc , pqoce, pqfwf ) ! ==>> out 82 82 !!---------------------------------------------------------------------- … … 106 106 pqhc (:,:) = pqfwf(:,:) * ztfrz(:,:) * rcp ! heat content flux ( >0 out) 107 107 ! 108 END SUBROUTINE isf mlt_spe109 110 SUBROUTINE isf mlt_2eq(pgt, pttbl, pstbl, & ! <<== in108 END SUBROUTINE isfcav_mlt_spe 109 110 SUBROUTINE isfcav_mlt_2eq(pgt, pttbl, pstbl, & ! <<== in 111 111 & pqhc , pqoce, pqfwf ) ! ==>> out 112 112 !!---------------------------------------------------------------------- … … 147 147 CALL iom_put('isfthermald_cav', zthd ) 148 148 ! 149 END SUBROUTINE isf mlt_2eq150 151 SUBROUTINE isf mlt_3eq(pgt, pgs , pttbl, pstbl, &149 END SUBROUTINE isfcav_mlt_2eq 150 151 SUBROUTINE isfcav_mlt_3eq(pgt, pgs , pttbl, pstbl, & 152 152 & pqhc, pqoce, pqfwf ) 153 153 !!---------------------------------------------------------------------- … … 229 229 CALL iom_put('isfthermald_cav', zthd) 230 230 ! 231 END SUBROUTINE isf mlt_3eq232 233 SUBROUTINE isf mlt_oasis(kt, pstbl, & ! <<== in231 END SUBROUTINE isfcav_mlt_3eq 232 233 SUBROUTINE isfcav_mlt_oasis(kt, pstbl, & ! <<== in 234 234 & pqhc , pqoce, pqfwf ) ! ==>> out 235 235 !!---------------------------------------------------------------------- … … 263 263 ! 264 264 ! compute glob sum from input file 265 zfwf_fld = glob_sum('isfcav_mlt', zfwf(:,:)) 265 ! (PM) should consider delay sum as in fwb (1 time step offset if I well understood) 266 zfwf_fld = glob_sum('isfcav_mlt', e1e2t(:,:) * zfwf(:,:)) 266 267 ! 267 268 ! compute glob sum from atm->oce ice shelf fwf 268 zfwf_oasis = glob_sum('isfcav_mlt', fwfisf_oasis(:,:)) 269 ! (PM) should consider delay sum as in fwb (1 time step offset if I well understood) 270 zfwf_oasis = glob_sum('isfcav_mlt', e1e2t(:,:) * fwfisf_oasis(:,:)) 269 271 ! 270 272 ! scale fwf … … 277 279 pqhc (:,:) = pqfwf(:,:) * ztfrz(:,:) * rcp ! heat content flux ( >0 out) 278 280 ! 279 END SUBROUTINE isf mlt_oasis281 END SUBROUTINE isfcav_mlt_oasis 280 282 281 283 !SUBROUTINE isfmlt_3eq_frz_ktm1 -
NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfparmlt.F90
r11423 r11425 192 192 ! 193 193 ! compute glob sum from input file 194 zfwf_fld = glob_sum('isfcav_mlt', zfwf(:,:)) 194 ! (PM) should we consider delay sum as in fwb ? (it will offset by 1 time step if I understood well) 195 zfwf_fld = glob_sum('isfcav_mlt', e1e2t(:,:) * zfwf(:,:)) 195 196 ! 196 197 ! compute glob sum from atm->oce ice shelf fwf 197 zfwf_oasis = glob_sum('isfcav_mlt', fwfisf_oasis(:,:)) 198 ! (PM) should we consider delay sum as in fwb ? 199 zfwf_oasis = glob_sum('isfcav_mlt', e1e2t(:,:) * fwfisf_oasis(:,:)) 198 200 ! 199 201 ! scale fwf -
NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfstp.F90
r11423 r11425 267 267 IF( lwxios ) CALL iom_set_rstw_var_active('ssmask') 268 268 IF( lwxios ) CALL iom_set_rstw_var_active('tmask') 269 !IF( lwxios ) CALL iom_set_rstw_var_active('wmask') 270 !IF( lwxios ) CALL iom_set_rstw_var_active('gdepw_n') 269 271 IF( lwxios ) CALL iom_set_rstw_var_active('e3t_n') 270 272 IF( lwxios ) CALL iom_set_rstw_var_active('e3u_n')
Note: See TracChangeset
for help on using the changeset viewer.