Changeset 7024
- Timestamp:
- 2016-10-12T19:09:03+02:00 (8 years ago)
- Location:
- branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM
- Files:
-
- 1 deleted
- 4 edited
-
CONFIG/SHARED/namelist_ref (modified) (1 diff)
-
CONFIG/cfg.txt (modified) (1 diff)
-
NEMO/OPA_SRC/DOM/domain.F90 (modified) (5 diffs)
-
NEMO/OPA_SRC/DOM/domcfg.F90 (deleted)
-
NEMO/OPA_SRC/nemogcm.F90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/SHARED/namelist_ref
r7005 r7024 807 807 ln_hpg_zco = .false. ! z-coordinate - full steps 808 808 ln_hpg_zps = .false. ! z-coordinate - partial steps (interpolation) 809 ln_hpg_sco = . true.! s-coordinate (standard jacobian formulation)809 ln_hpg_sco = .false. ! s-coordinate (standard jacobian formulation) 810 810 ln_hpg_isf = .false. ! s-coordinate (sco ) adapted to isf 811 811 ln_hpg_djc = .false. ! s-coordinate (Density Jacobian with Cubic polynomial) -
branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/cfg.txt
r6916 r7024 10 10 ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC 11 11 ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC 12 GYRE OPA_SRC13 12 OVERFLOW OPA_SRC 14 13 LOCK_EXCHANGE OPA_SRC 15 14 GYRE_prova OPA_SRC 16 15 LOCK_prova OPA_SRC 16 GYRE OPA_SRC -
branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90
r6979 r7024 14 14 !! 3.6 ! 2013 ( J. Simeon, C. Calone, G. Madec, C. Ethe ) Online coarsening of outputs 15 15 !! 3.7 ! 2015-11 (G. Madec, A. Coward) time varying zgr by default 16 !! 4.0 ! 2016-10 (G. Madec, S. Flavoni) domain configuration / user defined interface 16 17 !!---------------------------------------------------------------------- 17 18 18 19 !!---------------------------------------------------------------------- 19 20 !! dom_init : initialize the space and time domain 21 !! dom_glo : initialize global domain <--> local domain indices 20 22 !! dom_nam : read and contral domain namelists 21 23 !! dom_ctl : control print for the ocean domain … … 32 34 USE domwri ! domain: write the meshmask file 33 35 USE domvvl ! variable volume 34 USE c1d ! 1D vertical configuration 35 USE dyncor_c1d ! Coriolis term (c1d case) (cor_c1d routine) 36 USE c1d ! 1D configuration 37 USE domc1d ! 1D configuration: column location 38 USE dyncor_c1d ! 1D configuration: Coriolis term (cor_c1d routine) 36 39 ! 37 40 USE in_out_manager ! I/O manager … … 84 87 ! 85 88 WRITE(numout,*) ' Domain info' 86 WRITE(numout,*) ' dimension of model '89 WRITE(numout,*) ' dimension of model:' 87 90 WRITE(numout,*) ' Local domain Global domain Data domain ' 88 91 WRITE(numout,cform) ' ',' jpi : ', jpi, ' jpiglo : ', jpiglo … … 90 93 WRITE(numout,cform) ' ',' jpk : ', jpk, ' jpkglo : ', jpkglo 91 94 WRITE(numout,cform) ' ' ,' jpij : ', jpij 92 WRITE(numout,*) ' mpp local domain info (mpp) '95 WRITE(numout,*) ' mpp local domain info (mpp):' 93 96 WRITE(numout,*) ' jpni : ', jpni, ' jpreci : ', jpreci 94 97 WRITE(numout,*) ' jpnj : ', jpnj, ' jprecj : ', jprecj 95 98 WRITE(numout,*) ' jpnij : ', jpnij 96 99 WRITE(numout,*) ' lateral boundary of the Global domain : jperio = ', jperio 97 ENDIF 100 SELECT CASE ( jperio ) 101 CASE( 0 ) ; WRITE(numout,*) ' (i.e. closed)' 102 CASE( 1 ) ; WRITE(numout,*) ' (i.e. cyclic east-west)' 103 CASE( 2 ) ; WRITE(numout,*) ' (i.e. equatorial symmetric)' 104 CASE( 3 ) ; WRITE(numout,*) ' (i.e. north fold with T-point pivot)' 105 CASE( 4 ) ; WRITE(numout,*) ' (i.e. cyclic east-west and north fold with T-point pivot)' 106 CASE( 5 ) ; WRITE(numout,*) ' (i.e. north fold with F-point pivot)' 107 CASE( 6 ) ; WRITE(numout,*) ' (i.e. cyclic east-west and north fold with F-point pivot)' 108 CASE DEFAULT 109 CALL ctl_stop( 'jperio is out of range' ) 110 END SELECT 111 WRITE(numout,*) ' Ocean model configuration used:' 112 WRITE(numout,*) ' cp_cfg = ', cp_cfg 113 WRITE(numout,*) ' jp_cfg = ', jp_cfg 114 ENDIF 115 ! 116 ! 117 !!gm This should be removed with the new configuration interface 118 IF( lk_c1d .AND. ln_c1d_locpt ) CALL dom_c1d( rn_lat1d, rn_lon1d ) 119 !!gm end 98 120 ! 99 121 ! !== Reference coordinate system ==! 100 ! 122 ! 123 CALL dom_glo ! global domain versus local domain 101 124 CALL dom_nam ! read namelist ( namrun, namdom ) 102 125 CALL dom_clo( cp_cfg, jp_cfg ) ! Closed seas and lake … … 174 197 ! 175 198 END SUBROUTINE dom_init 199 200 201 SUBROUTINE dom_glo 202 !!---------------------------------------------------------------------- 203 !! *** ROUTINE dom_glo *** 204 !! 205 !! ** Purpose : initialization of global domain <--> local domain indices 206 !! 207 !! ** Method : 208 !! 209 !! ** Action : - mig , mjg : local domain indices ==> global domain indices 210 !! - mi0 , mi1 : global domain indices ==> local domain indices 211 !! - mj0,, mj1 (global point not in the local domain ==> mi0>mi1 and/or mj0>mj1) 212 !!---------------------------------------------------------------------- 213 INTEGER :: ji, jj ! dummy loop argument 214 !!---------------------------------------------------------------------- 215 ! 216 DO ji = 1, jpi ! local domain indices ==> global domain indices 217 mig(ji) = ji + nimpp - 1 218 END DO 219 DO jj = 1, jpj 220 mjg(jj) = jj + njmpp - 1 221 END DO 222 ! ! global domain indices ==> local domain indices 223 ! ! (return (m.0,m.1)=(1,0) if data domain gridpoint is to the west/south of the 224 ! ! local domain, or (m.0,m.1)=(jp.+1,jp.) to the east/north of local domain. 225 DO ji = 1, jpiglo 226 mi0(ji) = MAX( 1 , MIN( ji - nimpp + 1, jpi+1 ) ) 227 mi1(ji) = MAX( 0 , MIN( ji - nimpp + 1, jpi ) ) 228 END DO 229 DO jj = 1, jpjglo 230 mj0(jj) = MAX( 1 , MIN( jj - njmpp + 1, jpj+1 ) ) 231 mj1(jj) = MAX( 0 , MIN( jj - njmpp + 1, jpj ) ) 232 END DO 233 IF(lwp) THEN ! control print 234 WRITE(numout,*) 235 WRITE(numout,*) 'dom_glo : domain: global <<==>> local ' 236 WRITE(numout,*) '~~~~~~~ ' 237 WRITE(numout,*) ' global domain: jpiglo = ', jpiglo, ' jpjglo = ', jpjglo, ' jpkglo = ', jpkglo 238 WRITE(numout,*) ' local domain: jpi = ', jpi , ' jpj = ', jpj , ' jpk = ', jpk 239 WRITE(numout,*) 240 WRITE(numout,*) ' conversion from local to global domain indices (and vise versa) done' 241 IF( nn_print >= 1 ) THEN 242 WRITE(numout,*) 243 WRITE(numout,*) ' conversion local ==> global i-index domain' 244 WRITE(numout,25) (mig(ji),ji = 1,jpi) 245 WRITE(numout,*) 246 WRITE(numout,*) ' conversion global ==> local i-index domain' 247 WRITE(numout,*) ' starting index' 248 WRITE(numout,25) (mi0(ji),ji = 1,jpiglo) 249 WRITE(numout,*) ' ending index' 250 WRITE(numout,25) (mi1(ji),ji = 1,jpiglo) 251 WRITE(numout,*) 252 WRITE(numout,*) ' conversion local ==> global j-index domain' 253 WRITE(numout,25) (mjg(jj),jj = 1,jpj) 254 WRITE(numout,*) 255 WRITE(numout,*) ' conversion global ==> local j-index domain' 256 WRITE(numout,*) ' starting index' 257 WRITE(numout,25) (mj0(jj),jj = 1,jpjglo) 258 WRITE(numout,*) ' ending index' 259 WRITE(numout,25) (mj1(jj),jj = 1,jpjglo) 260 ENDIF 261 ENDIF 262 25 FORMAT( 100(10x,19i4,/) ) 263 ! 264 END SUBROUTINE dom_glo 176 265 177 266 -
branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
r6974 r7024 33 33 !! - ! 2013-06 (I. Epicoco, S. Mocavero, CMCC) nemo_northcomms: setup avoiding MPI communication 34 34 !! - ! 2014-12 (G. Madec) remove KPP scheme and cross-land advection (cla) 35 !! 4.0 ! 2016-10 (G. Madec, S. Flavoni) domain configuration / user defined interface 35 36 !!---------------------------------------------------------------------- 36 37 … … 45 46 !!---------------------------------------------------------------------- 46 47 USE step_oce ! module used in the ocean time stepping module (step.F90) 47 USE domcfg ! domain configuration (dom_cfg routine)48 48 USE mppini ! shared/distributed memory setting (mpp_init routine) 49 49 USE domain ! domain initialization (dom_init routine) … … 131 131 CALL Agrif_Init_Grids() ! AGRIF: set the meshes 132 132 #endif 133 133 ! 134 134 ! !-----------------------! 135 135 CALL nemo_init !== Initialisations ==! … … 453 453 IF( lk_c1d ) CALL c1d_init ! 1D column configuration 454 454 CALL wad_init ! Wetting and drying options 455 CALL dom_cfg ! Domain configuration456 455 CALL dom_init ! Domain 457 456 IF( ln_crs ) CALL crs_init ! coarsened grid: domain initialization
Note: See TracChangeset
for help on using the changeset viewer.
