Changeset 8411 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO
- Timestamp:
- 2017-08-07T18:09:12+02:00 (7 years ago)
- Location:
- branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO
- Files:
-
- 2 added
- 2 deleted
- 13 edited
-
LIM_SRC_3/iceadv.F90 (modified) (3 diffs)
-
LIM_SRC_3/icecons.F90 (added)
-
LIM_SRC_3/icectl.F90 (added)
-
LIM_SRC_3/iceerr1.F90 (modified) (3 diffs)
-
LIM_SRC_3/iceerr2.F90 (modified) (3 diffs)
-
LIM_SRC_3/icerdgrft.F90 (modified) (3 diffs)
-
LIM_SRC_3/icerhg.F90 (modified) (3 diffs)
-
LIM_SRC_3/icestp.F90 (modified) (3 diffs)
-
LIM_SRC_3/limcons.F90 (deleted)
-
LIM_SRC_3/limctl.F90 (deleted)
-
LIM_SRC_3/limitd_th.F90 (modified) (3 diffs)
-
LIM_SRC_3/limmp.F90 (modified) (1 diff)
-
LIM_SRC_3/limrst.F90 (modified) (2 diffs)
-
LIM_SRC_3/limsbc.F90 (modified) (2 diffs)
-
LIM_SRC_3/limthd.F90 (modified) (4 diffs)
-
LIM_SRC_3/limthd_lac.F90 (modified) (3 diffs)
-
OPA_SRC/BDY/bdyice.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90
r8409 r8411 29 29 USE lib_fortran ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined) 30 30 USE timing ! Timing 31 USE limcons ! conservation tests32 USE limctl ! control prints31 USE icecons ! conservation tests 32 USE icectl ! control prints 33 33 34 34 IMPLICIT NONE … … 103 103 104 104 ! conservation test 105 IF( ln_limdiachk ) CALL lim_cons_hsm(0, 'iceadv', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)105 IF( ln_limdiachk ) CALL ice_cons_hsm(0, 'iceadv', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 106 106 107 107 ! store old values for diag … … 513 513 514 514 ! conservation test 515 IF( ln_limdiachk ) CALL lim_cons_hsm(1, 'iceadv', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)515 IF( ln_limdiachk ) CALL ice_cons_hsm(1, 'iceadv', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 516 516 517 517 ! ------------------------------------------------- 518 518 ! control prints 519 519 ! ------------------------------------------------- 520 IF( ln_limctl ) CALL lim_prt( kt, iiceprt, jiceprt,-1, ' - ice dyn & trp - ' )520 IF( ln_limctl ) CALL ice_prt( kt, iiceprt, jiceprt,-1, ' - ice dyn & trp - ' ) 521 521 ! 522 522 IF( nn_timing == 1 ) CALL timing_stop('iceadv') -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr1.F90
r8410 r8411 19 19 USE limitd_th 20 20 USE limvar 21 USE limcons ! conservation tests22 USE limctl ! control prints21 USE icecons ! conservation tests 22 USE icectl ! control prints 23 23 ! 24 24 USE lib_mpp ! MPP library … … 63 63 64 64 ! conservation test 65 IF( ln_limdiachk ) CALL lim_cons_hsm(0, 'iceerr1', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)65 IF( ln_limdiachk ) CALL ice_cons_hsm(0, 'iceerr1', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 66 66 67 67 !---------------------------------------------------- … … 132 132 133 133 ! conservation test 134 IF( ln_limdiachk ) CALL lim_cons_hsm(1, 'iceerr1', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)134 IF( ln_limdiachk ) CALL ice_cons_hsm(1, 'iceerr1', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 135 135 136 136 ! control prints 137 IF( ln_ctl ) CALL lim_prt3D( 'iceerr1' )137 IF( ln_ctl ) CALL ice_prt3D( 'iceerr1' ) 138 138 139 139 IF( nn_timing == 1 ) CALL timing_stop('iceerr1') -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr2.F90
r8410 r8411 19 19 USE limitd_th 20 20 USE limvar 21 USE limcons ! conservation tests22 USE limctl21 USE icecons ! conservation tests 22 USE icectl 23 23 ! 24 24 USE lbclnk ! lateral boundary condition - MPP exchanges … … 64 64 65 65 ! conservation test 66 IF( ln_limdiachk ) CALL lim_cons_hsm(0, 'iceerr2', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)66 IF( ln_limdiachk ) CALL ice_cons_hsm(0, 'iceerr2', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 67 67 68 68 !---------------------------------------------------------------------- … … 170 170 171 171 ! conservation test 172 IF( ln_limdiachk ) CALL lim_cons_hsm(1, 'iceerr2', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)172 IF( ln_limdiachk ) CALL ice_cons_hsm(1, 'iceerr2', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 173 173 174 174 ! control prints 175 IF( ln_limctl ) CALL lim_prt( kt, iiceprt, jiceprt, 2, ' - Final state - ' )176 IF( ln_ctl ) CALL lim_prt3D( 'iceerr2' )175 IF( ln_limctl ) CALL ice_prt( kt, iiceprt, jiceprt, 2, ' - Final state - ' ) 176 IF( ln_ctl ) CALL ice_prt3D( 'iceerr2' ) 177 177 178 178 IF( nn_timing == 1 ) CALL timing_stop('iceerr2') -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerdgrft.F90
r8409 r8411 19 19 USE ice ! LIM variables 20 20 USE limvar ! LIM 21 USE limcons ! conservation tests22 USE limctl ! control prints21 USE icecons ! conservation tests 22 USE icectl ! control prints 23 23 ! 24 24 USE lbclnk ! lateral boundary condition - MPP exchanges … … 122 122 123 123 ! conservation test 124 IF( ln_limdiachk ) CALL lim_cons_hsm(0, 'icerdgrft', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)124 IF( ln_limdiachk ) CALL ice_cons_hsm(0, 'icerdgrft', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 125 125 126 126 !-----------------------------------------------------------------------------! … … 281 281 !-----------------------------------------------------------------------------! 282 282 ! conservation test 283 IF( ln_limdiachk ) CALL lim_cons_hsm(1, 'icerdgrft', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)283 IF( ln_limdiachk ) CALL ice_cons_hsm(1, 'icerdgrft', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 284 284 285 285 ! control prints 286 IF( ln_ctl ) CALL lim_prt3D( 'icerdgrft' )286 IF( ln_ctl ) CALL ice_prt3D( 'icerdgrft' ) 287 287 ! 288 288 IF( nn_timing == 1 ) CALL timing_stop('icerdgrft') -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icerhg.F90
r8409 r8411 19 19 USE ice ! LIM-3 variables 20 20 USE icerhg_evp ! EVP rheology 21 USE limcons ! conservation tests22 USE limctl ! control prints21 USE icecons ! conservation tests 22 USE icectl ! control prints 23 23 USE limvar 24 24 ! … … 65 65 ! 66 66 ! conservation test 67 IF( ln_limdiachk ) CALL lim_cons_hsm(0, 'icerhg', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)67 IF( ln_limdiachk ) CALL ice_cons_hsm(0, 'icerhg', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 68 68 69 69 ! Landfast ice parameterization: define max bottom friction … … 92 92 ! 93 93 ! conservation test 94 IF( ln_limdiachk ) CALL lim_cons_hsm(1, 'icerhg', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)94 IF( ln_limdiachk ) CALL ice_cons_hsm(1, 'icerhg', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 95 95 96 96 ! Control prints 97 IF( ln_ctl ) CALL lim_prt3D( 'icerhg' )97 IF( ln_ctl ) CALL ice_prt3D( 'icerhg' ) 98 98 ! 99 99 IF( nn_timing == 1 ) CALL timing_stop('icerhg') -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90
r8410 r8411 8 8 !! History : 2.0 ! 2006-12 (M. Vancoppenolle) Original code 9 9 !! 3.0 ! 2008-02 (C. Talandier) Surface module from icestp.F90 10 !! - ! 2008-04 (G. Madec) sltyle and lim_ctl routine10 !! - ! 2008-04 (G. Madec) sltyle and ice_ctl routine 11 11 !! 3.3 ! 2010-11 (G. Madec) ice-ocean stress always computed at each ocean time-step 12 12 !! 3.4 ! 2011-01 (A Porter) dynamical allocation … … 43 43 USE iceerr2 ! Ice corrections after thermo 44 44 USE limvar ! Ice variables switch 45 USE limctl !45 USE icectl ! 46 46 ! MV MP 2016 47 47 USE limmp … … 222 222 IF( lrst_ice ) CALL lim_rst_write( kt ) ! -- Ice restart file 223 223 ! 224 IF( ln_limctl ) CALL lim_ctl( kt ) ! alerts in case of model crash224 IF( ln_limctl ) CALL ice_ctl( kt ) ! alerts in case of model crash 225 225 ! 226 226 ENDIF ! End sea-ice time step only -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90
r8410 r8411 24 24 USE ice ! LIM-3 variables 25 25 USE limvar ! LIM-3 variables 26 USE limcons ! conservation tests26 USE icecons ! conservation tests 27 27 USE limtab 28 28 ! … … 82 82 ENDIF 83 83 84 IF( ln_limdiachk ) CALL lim_cons_hsm(0, 'limitd_th_rem', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)84 IF( ln_limdiachk ) CALL ice_cons_hsm(0, 'limitd_th_rem', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 85 85 86 86 !----------------------------------------------------------------------------------------------- … … 313 313 ENDIF 314 314 315 IF( ln_limdiachk ) CALL lim_cons_hsm(1, 'limitd_th_rem', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)315 IF( ln_limdiachk ) CALL ice_cons_hsm(1, 'limitd_th_rem', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 316 316 317 317 END SUBROUTINE lim_itd_th_rem -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limmp.F90
r8378 r8411 27 27 ! USE sbc_ice ! Surface boundary condition: ice fields 28 28 USE ice ! LIM-3 variables 29 ! USE limcons ! conservation tests29 ! USE icecons ! conservation tests 30 30 ! USE limctl ! control prints 31 31 ! USE limvar -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90
r8378 r8411 20 20 USE dom_oce ! ocean domain 21 21 USE sbc_oce , ONLY : nn_fsbc 22 USE limctl22 USE icectl 23 23 ! 24 24 USE in_out_manager ! I/O manager … … 90 90 ENDIF 91 91 ! 92 IF( ln_limctl ) CALL lim_prt( kt, iiceprt, jiceprt, 1, ' - Beginning the time step - ' ) ! control print92 IF( ln_limctl ) CALL ice_prt( kt, iiceprt, jiceprt, 1, ' - Beginning the time step - ' ) ! control print 93 93 END SUBROUTINE lim_rst_opn 94 94 -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90
r8404 r8411 35 35 USE traqsr ! add penetration of solar flux in the calculation of heat budget 36 36 USE domvvl ! Variable volume 37 USE limctl !38 USE limcons !37 USE icectl ! 38 USE icecons ! 39 39 USE bdy_oce , ONLY: ln_bdy 40 40 ! … … 206 206 207 207 ! conservation test 208 IF( ln_limdiachk .AND. .NOT. ln_bdy) CALL lim_cons_final( 'limsbc' )208 IF( ln_limdiachk .AND. .NOT. ln_bdy) CALL ice_cons_final( 'limsbc' ) 209 209 210 210 ! control prints 211 IF( ln_limctl ) CALL lim_prt( kt, iiceprt, jiceprt, 3, ' - Final state lim_sbc - ' )212 IF( ln_ctl ) CALL lim_prt3D( 'limsbc' )211 IF( ln_limctl ) CALL ice_prt( kt, iiceprt, jiceprt, 3, ' - Final state lim_sbc - ' ) 212 IF( ln_ctl ) CALL ice_prt3D( 'limsbc' ) 213 213 214 214 END SUBROUTINE lim_sbc_flx -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90
r8379 r8411 36 36 USE limtab ! 1D <==> 2D transformation 37 37 USE limvar ! 38 USE limcons ! conservation tests39 USE limctl ! control print38 USE icecons ! conservation tests 39 USE icectl ! control print 40 40 ! 41 41 USE in_out_manager ! I/O manager … … 99 99 100 100 ! conservation test 101 IF( ln_limdiachk ) CALL lim_cons_hsm(0, 'limthd', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)101 IF( ln_limdiachk ) CALL ice_cons_hsm(0, 'limthd', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 102 102 103 103 CALL lim_var_glo2eqv … … 257 257 oa_i(:,:,:) = o_i(:,:,:) * a_i(:,:,:) 258 258 259 IF( ln_limdiachk ) CALL lim_cons_hsm(1, 'limthd', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)259 IF( ln_limdiachk ) CALL ice_cons_hsm(1, 'limthd', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 260 260 ! 261 261 CALL lim_var_zapsmall ! --- remove very small ice concentration (<1e-10) --- ! … … 266 266 IF( ln_limdO ) CALL lim_thd_lac ! --- frazil ice growing in leads --- ! 267 267 ! 268 IF( ln_limctl ) CALL lim_prt( kt, iiceprt, jiceprt, 1, ' - ice thermodyn. - ' ) ! control print269 IF( ln_ctl ) CALL lim_prt3D( 'limthd' ) ! Control print268 IF( ln_limctl ) CALL ice_prt( kt, iiceprt, jiceprt, 1, ' - ice thermodyn. - ' ) ! control print 269 IF( ln_ctl ) CALL ice_prt3D( 'limthd' ) ! Control print 270 270 ! 271 271 IF( nn_timing == 1 ) CALL timing_stop('limthd') -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90
r8379 r8411 23 23 USE ice ! LIM variables 24 24 USE limtab ! LIM 2D <==> 1D 25 USE limcons ! LIM conservation25 USE icecons ! LIM conservation 26 26 USE limthd_ent 27 27 USE limvar … … 112 112 !!-----------------------------------------------------------------------! 113 113 114 IF( ln_limdiachk ) CALL lim_cons_hsm(0, 'limthd_lac', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)114 IF( ln_limdiachk ) CALL ice_cons_hsm(0, 'limthd_lac', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 115 115 116 116 CALL lim_var_agg(1) … … 478 478 ENDIF ! nidx > 0 479 479 ! 480 IF( ln_limdiachk ) CALL lim_cons_hsm(1, 'limthd_lac', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)480 IF( ln_limdiachk ) CALL ice_cons_hsm(1, 'limthd_lac', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b) 481 481 ! 482 482 END SUBROUTINE lim_thd_lac -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90
r8407 r8411 21 21 USE ice ! LIM_3 ice variables 22 22 USE limvar 23 USE limctl23 USE icectl 24 24 USE par_oce ! ocean parameters 25 25 USE dom_oce ! ocean space and time domain variables … … 73 73 CALL lim_var_zapsmall 74 74 CALL lim_var_agg(1) 75 IF( ln_limctl ) CALL lim_prt( kt, iiceprt, jiceprt, 1, ' - ice thermo bdy - ' )75 IF( ln_limctl ) CALL ice_prt( kt, iiceprt, jiceprt, 1, ' - ice thermo bdy - ' ) 76 76 ! 77 77 END SUBROUTINE bdy_ice
Note: See TracChangeset
for help on using the changeset viewer.
