Changeset 9161 for branches/2017/dev_merge_2017/NEMOGCM/NEMO
- Timestamp:
- 2017-12-22T11:31:53+01:00 (6 years ago)
- Location:
- branches/2017/dev_merge_2017/NEMOGCM/NEMO
- Files:
-
- 1 deleted
- 7 edited
- 1 copied
-
OPA_SRC/DOM/closea.F90 (copied) (copied from branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90) (5 diffs)
-
OPA_SRC/DOM/dom_oce.F90 (modified) (1 diff)
-
OPA_SRC/DOM/domain.F90 (modified) (4 diffs)
-
OPA_SRC/DOM/domzgr.F90 (modified) (2 diffs)
-
OPA_SRC/SBC/sbcmod.F90 (modified) (3 diffs)
-
OPA_SRC/SBC/sbcrnf.F90 (modified) (2 diffs)
-
OPA_SRC/USR/usrdef_closea.F90 (deleted)
-
OPA_SRC/nemogcm.F90 (modified) (2 diffs)
-
SAS_SRC/sbcssm.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90
r9155 r9161 29 29 USE lbclnk ! lateral boundary condition - MPP exchanges 30 30 USE lib_mpp ! MPP library 31 USE timing 31 USE timing ! Timing 32 32 33 33 IMPLICIT NONE … … 65 65 !!---------------------------------------------------------------------- 66 66 !! NEMO/OPA 4.0 , NEMO Consortium (2016) 67 !! $Id $67 !! $Id: usrdef_closea.F90 9124 2017-12-19 08:26:25Z gm $ 68 68 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 69 69 !!---------------------------------------------------------------------- … … 203 203 !!---------------------------------------------------------------------- 204 204 ! 205 IF( nn_timing == 1) CALL timing_start('sbc_clo')205 IF( ln_timing ) CALL timing_start('sbc_clo') 206 206 ! 207 207 ! !------------------! … … 328 328 IF( jncse > 0 ) THEN 329 329 ! 330 ! 3. Work out total fluxes over empmr source areas and add to empmr target areas. If jncse is zero does not loop.330 ! 3. Work out total fluxes over empmr source areas and add to empmr target areas. 331 331 ! 332 332 DO jce = 1, jncse … … 387 387 CALL lbc_lnk( emp , 'T', 1._wp ) 388 388 ! 389 IF( nn_timing == 1 ) CALL timing_stop('sbc_clo')390 !391 389 END SUBROUTINE sbc_clo 392 390 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90
r9023 r9161 31 31 ! !!* Namelist namdom : time & space domain * 32 32 LOGICAL , PUBLIC :: ln_linssh !: =T linear free surface ==>> model level are fixed in time 33 INTEGER , PUBLIC :: nn_closea !: =0 suppress closed sea/lake from the ORCA domain or not (=1)34 33 INTEGER , PUBLIC :: nn_msh !: >0 create a mesh-mask file (mesh_mask.nc) 35 34 REAL(wp), PUBLIC :: rn_isfhmin !: threshold to discriminate grounded ice to floating ice -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90
r9124 r9161 30 30 USE trc_oce ! shared ocean & passive tracers variab 31 31 USE phycst ! physical constants 32 USE usrdef_closea! closed seas32 USE closea ! closed seas 33 33 USE domhgr ! domain: set the horizontal mesh 34 34 USE domzgr ! domain: set the vertical mesh … … 118 118 CALL dom_glo ! global domain versus local domain 119 119 CALL dom_nam ! read namelist ( namrun, namdom ) 120 CALL dom_clo( cn_cfg, nn_cfg ) ! Closed seas and lake121 120 CALL dom_hgr ! Horizontal mesh 122 121 CALL dom_zgr( ik_top, ik_bot ) ! Vertical mesh and bathymetry 123 IF( nn_closea == 0 ) CALL clo_bat( ik_top, ik_bot ) !== remove closed seas or lakes ==!124 122 CALL dom_msk( ik_top, ik_bot ) ! Masks 123 IF( ln_closea ) CALL dom_clo ! ln_closea=T : closed seas included in the simulation 124 ! Read in masks to define closed seas and lakes 125 125 ! 126 126 DO jj = 1, jpj ! depth of the iceshelves … … 274 274 & nn_stock, nn_write , ln_mskland , ln_clobber , nn_chunksz, nn_euler , & 275 275 & ln_cfmeta, ln_iscpl 276 NAMELIST/namdom/ ln_linssh, nn_ closea, nn_msh, rn_isfhmin, rn_rdt, rn_atfp, ln_crs276 NAMELIST/namdom/ ln_linssh, nn_msh, rn_isfhmin, rn_rdt, rn_atfp, ln_crs 277 277 #if defined key_netcdf4 278 278 NAMELIST/namnc4/ nn_nchunks_i, nn_nchunks_j, nn_nchunks_k, ln_nc4zip … … 383 383 WRITE(numout,*) ' Namelist namdom : space & time domain' 384 384 WRITE(numout,*) ' linear free surface (=T) ln_linssh = ', ln_linssh 385 WRITE(numout,*) ' suppression of closed seas (=0) nn_closea = ', nn_closea386 385 WRITE(numout,*) ' create mesh/mask file(s) nn_msh = ', nn_msh 387 386 WRITE(numout,*) ' = 0 no file created ' -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
r9124 r9161 29 29 USE dom_oce ! ocean domain 30 30 USE usrdef_zgr ! user defined vertical coordinate system 31 USE closea ! closed seas 31 32 USE depth_e3 ! depth <=> e3 32 33 USE wet_dry, ONLY: ll_wd, ssh_ref ! Wetting and drying … … 114 115 gde3w_0(:,:,jk) = gde3w_0(:,:,jk-1) + e3w_0(:,:,jk) 115 116 END DO 117 ! 118 ! Any closed seas (defined by closea_mask > 0 in domain_cfg file) to be filled 119 ! in at runtime if ln_closea=.false. 120 IF( .not. ln_closea ) CALL clo_bat( k_top, k_bot ) 116 121 ! 117 122 IF(lwp) THEN ! Control print -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
r9124 r9161 50 50 USE bdy_oce , ONLY: ln_bdy 51 51 USE usrdef_sbc ! user defined: surface boundary condition 52 USE usrdef_closea ! user defined:closed sea52 USE closea ! closed sea 53 53 ! 54 54 USE prtctl ! Print control (prt_ctl routine) … … 151 151 WRITE(numout,*) ' runoff / runoff mouths ln_rnf = ', ln_rnf 152 152 WRITE(numout,*) ' iceshelf formulation ln_isf = ', ln_isf 153 WRITE(numout,*) ' closed sea (=0/1) (set in namdom) nn_closea = ', nn_closea154 153 WRITE(numout,*) ' nb of iterations if land-sea-mask applied nn_lsm = ', nn_lsm 155 154 WRITE(numout,*) ' surface wave ln_wave = ', ln_wave … … 435 434 IF( nn_fwb /= 0 ) CALL sbc_fwb( kt, nn_fwb, nn_fsbc ) ! control the freshwater budget 436 435 437 ! treatment of closed sea in the model domain (update freshwater fluxes)438 ! Should not be r an if ln_diurnal_only439 IF( .NOT.ln_diurnal_only .AND. nn_closea == 1 ) CALL sbc_clo( kt, cn_cfg, nn_cfg)436 ! Special treatment of freshwater fluxes over closed seas in the model domain 437 ! Should not be run if ln_diurnal_only 438 IF( l_sbc_clo .AND. (.NOT. ln_diurnal_only) ) CALL sbc_clo( kt ) 440 439 441 440 !RBbug do not understand why see ticket 667 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
r9125 r9161 21 21 USE sbcisf ! PM we could remove it I think 22 22 USE eosbn2 ! Equation Of State 23 USE usrdef_closea! closed seas23 USE closea ! closed seas 24 24 ! 25 25 USE in_out_manager ! I/O manager … … 510 510 CALL iom_close( inum ) ! close file 511 511 ! 512 IF( nn_closea == 1 ) CALL clo_rnf( rnfmsk ) ! closed sea inflow set as ruver mouth512 IF( l_clo_rnf ) CALL clo_rnf( rnfmsk ) ! closed sea inflow set as river mouth 513 513 ! 514 514 rnfmsk_z(:) = 0._wp ! vertical structure -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
r9124 r9161 48 48 USE phycst ! physical constant (par_cst routine) 49 49 USE domain ! domain initialization (dom_init & dom_cfg routines) 50 USE closea ! treatment of closed seas (for ln_closea) 50 51 USE usrdef_nam ! user defined configuration 51 52 USE tideini ! tidal components initialization (tide_ini routine) … … 242 243 & nn_isplt , nn_jsplt, nn_jctls, nn_jctle, & 243 244 & ln_timing, ln_diacfl 244 NAMELIST/namcfg/ ln_read_cfg, cn_domcfg, ln_write_cfg, cn_domcfg_out, ln_use_jattr 245 NAMELIST/namcfg/ ln_read_cfg, cn_domcfg, ln_write_cfg, cn_domcfg_out, ln_use_jattr, ln_closea 245 246 !!---------------------------------------------------------------------- 246 247 ! -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90
r9124 r9161 23 23 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 24 24 USE zpshde ! z-coord. with partial steps: horizontal derivatives 25 USE closea ! for ln_closea 25 26 ! 26 27 USE in_out_manager ! I/O manager … … 224 225 nn_fwb = 0 225 226 ENDIF 226 IF( nn_closea > 0) THEN227 IF( ln_closea ) THEN 227 228 IF( lwp ) WRITE(numout,*) 'No closed seas adjustment needed with StandAlone Surface scheme' 228 nn_closea = 0229 ln_closea = .false. 229 230 ENDIF 230 231 IF (l_sasread) THEN
Note: See TracChangeset
for help on using the changeset viewer.
