Changeset 7332
- Timestamp:
- 2016-11-25T09:38:58+01:00 (7 years ago)
- Location:
- branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO
- Files:
-
- 7 edited
-
OPA_SRC/CRS/crsdom.F90 (modified) (4 diffs)
-
OPA_SRC/ZDF/zdfmxl.F90 (modified) (1 diff)
-
OPA_SRC/nemogcm.F90 (modified) (2 diffs)
-
TOP_SRC/oce_trc.F90 (modified) (11 diffs)
-
TOP_SRC/trcdta.F90 (modified) (1 diff)
-
TOP_SRC/trcstp.F90 (modified) (2 diffs)
-
TOP_SRC/trcsub.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90
r7320 r7332 1166 1166 ENDDO 1167 1167 1168 !========================================================================== 1169 ! check 1170 !========================================================================== 1168 1171 !WRITE(narea+8000-1,*)"nfipproc(ji,jj),narea :",nfipproc(iproci,iprocj),narea 1169 1172 !WRITE(narea+8000-1,*)"proc i,j ",iproci,iprocj … … 1184 1187 !WRITE(narea+8000-1,*)"jpi_crs jpj_crs ",jpi_crs,jpj_crs 1185 1188 !WRITE(narea+8000-1,*)"glamt gphit ",glamt(1,1),gphit(jpi,jpj),glamt(jpi,jpj),gphit(jpi,jpj) 1189 !WRITE(narea+8000-1,*)"min max tmask ",MINVAL(tmask),MAXVAL(tmask) 1186 1190 1187 1191 !========================================================================== … … 1511 1515 END DO 1512 1516 1517 !========================================================================== 1518 ! check 1519 !========================================================================== 1513 1520 !WRITE(narea+8000-1,*)"loc crs jpi nldi,nlei,nlci ",jpi_crs, nldi_crs ,nlei_crs ,nlci_crs 1514 1521 !WRITE(narea+8000-1,*)"glo crs jpi nldi,nlei ",jpi_crs, nldi_crs+nimpp_crs-1,nlei_crs+nimpp_crs-1 … … 1516 1523 !WRITE(narea+8000-1,*)"glo crs jpj nldj,nlej ",jpj_crs, nldj_crs+njmpp_crs-1,nlej_crs+njmpp_crs-1 1517 1524 1518 IF( jpizoom /= 1 .OR. jpjzoom /= 1) STOP !cbr mettre un ctlstp et ailleurs ( crsini )1519 1520 1525 !========================================================================== 1521 1526 ! Save the parent grid information 1522 1527 !========================================================================== 1528 IF( jpizoom /= 1 .OR. jpjzoom /= 1) STOP !cbr mettre un ctlstp et ailleurs ( crsini ) 1523 1529 jpi_full = jpi 1524 1530 jpj_full = jpj -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
r7256 r7332 97 97 IF(lwp) WRITE(numout,*) '~~~~~~~ ' 98 98 ! ! allocate zdfmxl arrays 99 IF( zdf_mxl_alloc() /= 0 ) CALL ctl_stop( 'STOP', 'zdf_mxl : unable to allocate arrays' )100 99 ENDIF 101 100 -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
r7256 r7332 655 655 USE ldftra_oce, ONLY: ldftra_oce_alloc 656 656 USE trc_oce , ONLY: trc_oce_alloc 657 USE zdfmxl , ONLY: zdf_mxl_alloc 657 658 #if defined key_diadct 658 659 USE diadct , ONLY: diadct_alloc … … 671 672 ierr = ierr + ldftra_oce_alloc() ! ocean lateral physics : tracers 672 673 ierr = ierr + zdf_oce_alloc () ! ocean vertical physics 674 ierr = ierr + zdf_mxl_alloc () ! mixed layer 673 675 ! 674 676 ierr = ierr + trc_oce_alloc () ! shared TRC / TRA arrays -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90
r7320 r7332 108 108 USE crs , ONLY : e3v => e3v_n_crs !: vertical scale factors v- 109 109 USE crs , ONLY : e3w => e3w_n_crs !: w-points (m) 110 USE crs , ONLY : e3t_b => e3t_b_crs !: vertical scale factors at t- 111 USE crs , ONLY : e3u_b => e3u_b_crs !: vertical scale factors at u- 112 USE crs , ONLY : e3v_b => e3v_b_crs !: vertical scale factors v- 113 USE crs , ONLY : e3w_b => e3w_b_crs !: w-points (m) 110 114 USE crs , ONLY : e3t_n => e3t_n_crs !: vertical scale factors at t- 111 115 USE crs , ONLY : e3u_n => e3u_n_crs !: vertical scale factors at u- … … 116 120 USE crs , ONLY : e3v_a => e3v_a_crs !: vertical scale factors v- 117 121 USE crs , ONLY : e3w_a => e3w_a_crs !: w-points (m) 118 USE crs , ONLY : fse3t => e3t_n_crs !: vertical scale factors at t-119 USE crs , ONLY : fse3u => e3u_n_crs !: vertical scale factors at u-120 USE crs , ONLY : fse3v => e3v_n_crs !: vertical scale factors v-121 USE crs , ONLY : fse3w => e3w_n_crs !: w-points (m)122 122 USE crs , ONLY : gdept => gdept_n_crs !: depth of t-points (m) 123 123 USE crs , ONLY : gdept_crs => gdept_n_crs !: depth of t-points (m) 124 124 USE crs , ONLY : gdept_n => gdept_n_crs !: depth of t-points (m) 125 USE crs , ONLY : fse3t_b => e3t_b_crs !: vertical scale factors at t-126 USE crs , ONLY : fse3t_n => e3t_n_crs !: vertical scale factors at t-127 USE crs , ONLY : fse3t_a => e3t_a_crs !: vertical scale factors at t-128 USE crs , ONLY : fsdept_n => gdept_n_crs !: depth of t-points (m)129 125 USE crs , ONLY : e3t_max_crs => e3t_max_n_crs 130 126 USE crs , ONLY : e3u_max_crs => e3u_max_n_crs … … 136 132 USE crs , ONLY : e3v => e3v_0_crs !: vertical scale factors v- 137 133 USE crs , ONLY : e3w => e3w_0_crs !: w-points (m) 134 USE crs , ONLY : e3t_b => e3t_0_crs !: vertical scale factors at t- 135 USE crs , ONLY : e3u_b => e3u_0_crs !: vertical scale factors at u- 136 USE crs , ONLY : e3v_b => e3v_0_crs !: vertical scale factors v- 137 USE crs , ONLY : e3w_b => e3w_0_crs !: w-points (m) 138 138 USE crs , ONLY : e3t_n => e3t_0_crs !: vertical scale factors at t- 139 139 USE crs , ONLY : e3u_n => e3u_0_crs !: vertical scale factors at u- … … 144 144 USE crs , ONLY : e3v_a => e3v_0_crs !: vertical scale factors v- 145 145 USE crs , ONLY : e3w_a => e3w_0_crs !: w-points (m) 146 USE crs , ONLY : fse3t => e3t_0_crs !: vertical scale factors at t-147 USE crs , ONLY : fse3u => e3u_0_crs !: vertical scale factors at u-148 USE crs , ONLY : fse3v => e3v_0_crs !: vertical scale factors v-149 USE crs , ONLY : fse3w => e3w_0_crs !: w-points (m)150 146 USE crs , ONLY : gdept => gdept_0_crs !: depth of t-points (m) 151 147 USE crs , ONLY : gdepw => gdepw_0_crs !: depth of t-points (m) … … 153 149 USE crs , ONLY : gdepw_crs => gdepw_0_crs !: depth of t-points (m) 154 150 USE crs , ONLY : gdept_n => gdept_0_crs !: depth of t-points (m) 155 USE crs , ONLY : fse3t_b => e3t_0_crs !: vertical scale factors at t-156 USE crs , ONLY : fse3t_n => e3t_0_crs !: vertical scale factors at t-157 USE crs , ONLY : fse3t_a => e3t_0_crs !: vertical scale factors at t-158 USE crs , ONLY : fsdept_n => gdept_0_crs !: depth of t-points (m)159 151 USE crs , ONLY : e3t_max_crs => e3t_max_0_crs 160 152 USE crs , ONLY : e3u_max_crs => e3u_max_0_crs … … 167 159 USE crs , ONLY : e3w_0 => e3w_0_crs !: vertical scale factors at t- 168 160 169 USE crs , ONLY : ff => ff_crs !: f-points (m)170 USE crs , ONLY : gdept_0 => gdept_0_crs !: depth of t-points (m)161 USE crs , ONLY : ff => ff_crs !: f-points (m) 162 USE crs , ONLY : gdept_0 => gdept_0_crs !: depth of t-points (m) 171 163 USE dom_oce , ONLY : gdept_1d => gdept_1d !: depth of t-points (m) 172 164 #if defined key_zco … … 185 177 186 178 !* ocean fields: here now and after fields * 187 !cbr? USE crs , ONLY : ua => ua_crs !: i-horizontal velocity (m s-1)188 !cbr? USE crs , ONLY : va => va_crs !: j-horizontal velocity (m s-1)189 179 USE crs , ONLY : un => un_crs !: i-horizontal velocity (m s-1) 190 180 USE crs , ONLY : vn => vn_crs !: j-horizontal velocity (m s-1) … … 228 218 #endif 229 219 230 !cbr USE trc_oce231 220 USE trc_oce, ONLY : lk_offline 232 221 USE trc_oce, ONLY : nn_dttrc … … 316 305 USE dom_oce , ONLY : e3t_0 => e3t_0 !: vertical scale factors at t- 317 306 #if defined key_vvl 318 USE dom_oce , ONLY : fse3t_b => e3t_b319 USE dom_oce , ONLY : fse3t_n => e3t_n320 USE dom_oce , ONLY : fse3t => e3t_n321 USE dom_oce , ONLY : fse3u => e3u_n322 USE dom_oce , ONLY : fse3v => e3v_n323 USE dom_oce , ONLY : fse3w => e3w_n324 USE dom_oce , ONLY : fse3t_a => e3t_a325 307 USE dom_oce , ONLY : e3t_b => e3t_b 326 308 USE dom_oce , ONLY : e3t_n => e3t_n … … 337 319 USE dom_oce , ONLY : e3f => e3f_n !: f-points (m) 338 320 USE dom_oce , ONLY : gdept_n => gdept_n !: f-points (m) 339 USE dom_oce , ONLY : fsdept_n => gdept_n !: f-points (m)340 321 #else 341 322 USE dom_oce , ONLY : fse3t_n => e3t_0 … … 394 375 395 376 !* model domain * 396 !cbr USE dom_oce , ONLY : e3w_0397 377 USE dom_oce , ONLY : lzoom => lzoom 398 378 -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/trcdta.F90
r7256 r7332 37 37 !$AGRIF_END_DO_NOT_TREAT 38 38 !! * Substitutions 39 !cbr# include "domzgr_substitute.h90"39 # include "domzgr_substitute.h90" 40 40 !!---------------------------------------------------------------------- 41 41 !! NEMO/OPA 3.3 , NEMO Consortium (2010) -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/trcstp.F90
r7256 r7332 76 76 IF( l_trcdm2dc ) CALL trc_mean_qsr( kt ) 77 77 ! 78 !cbrIF( nn_dttrc /= 1 ) CALL trc_sub_stp( kt ) ! averaging physical variables for sub-stepping78 IF( nn_dttrc /= 1 ) CALL trc_sub_stp( kt ) ! averaging physical variables for sub-stepping 79 79 ! 80 80 IF( MOD( kt , nn_dttrc ) == 0 ) THEN ! only every nn_dttrc time step … … 102 102 IF( lk_trdmxl_trc ) CALL trd_mxl_trc ( kt ) ! trends: Mixed-layer 103 103 ! 104 !cbrIF( nn_dttrc /= 1 ) CALL trc_sub_reset( kt ) ! resetting physical variables when sub-stepping104 IF( nn_dttrc /= 1 ) CALL trc_sub_reset( kt ) ! resetting physical variables when sub-stepping 105 105 ! 106 106 ENDIF -
branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/trcsub.F90
r7256 r7332 39 39 40 40 !!* Substitution 41 !!# include "top_substitute.h90"41 # include "top_substitute.h90" 42 42 !!---------------------------------------------------------------------- 43 43 !! NEMO/TOP 3.3 , NEMO Consortium (2010)
Note: See TracChangeset
for help on using the changeset viewer.
