- Timestamp:
- 2016-02-15T13:24:20+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
r6204 r6315 139 139 ! horizontal grid definition 140 140 141 #if ! defined key_xios2142 141 CALL set_scalar 143 #endif144 142 145 143 IF( TRIM(cdname) == TRIM(cxios_context) ) THEN … … 1193 1191 REAL(wp), DIMENSION(:) , OPTIONAL, INTENT(in) :: lonvalue, latvalue 1194 1192 REAL(wp), DIMENSION(:,:) , OPTIONAL, INTENT(in) :: bounds_lon, bounds_lat, area 1195 LOGICAL, DIMENSION(:,:) , OPTIONAL, INTENT(in) :: mask 1193 #if ! defined key_xios2 1194 LOGICAL, DIMENSION(:,:) , OPTIONAL, INTENT(in) :: mask 1195 #else 1196 LOGICAL, DIMENSION(:) , OPTIONAL, INTENT(in) :: mask 1197 #endif 1196 1198 1197 1199 #if ! defined key_xios2 … … 1215 1217 CALL xios_set_domain_attr ( cdid, ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, jbegin=jbegin, ni=ni, nj=nj, & 1216 1218 & data_dim=data_dim, data_ibegin=data_ibegin, data_ni=data_ni, data_jbegin=data_jbegin, data_nj=data_nj , & 1217 & lonvalue_1D=lonvalue, latvalue_1D=latvalue, mask_ 2D=mask, nvertex=nvertex, bounds_lon_1D=bounds_lon,&1219 & lonvalue_1D=lonvalue, latvalue_1D=latvalue, mask_1D=mask, nvertex=nvertex, bounds_lon_1D=bounds_lon, & 1218 1220 & bounds_lat_1D=bounds_lat, area=area, type='curvilinear') 1219 1221 ENDIF … … 1221 1223 CALL xios_set_domaingroup_attr( cdid, ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, jbegin=jbegin, ni=ni, nj=nj, & 1222 1224 & data_dim=data_dim, data_ibegin=data_ibegin, data_ni=data_ni, data_jbegin=data_jbegin, data_nj=data_nj , & 1223 & lonvalue_1D=lonvalue, latvalue_1D=latvalue, mask_ 2D=mask, nvertex=nvertex, bounds_lon_1D=bounds_lon,&1225 & lonvalue_1D=lonvalue, latvalue_1D=latvalue, mask_1D=mask, nvertex=nvertex, bounds_lon_1D=bounds_lon, & 1224 1226 & bounds_lat_1D=bounds_lat, area=area, type='curvilinear' ) 1225 1227 ENDIF … … 1234 1236 INTEGER , OPTIONAL, INTENT(in) :: ibegin, jbegin, ni, nj 1235 1237 1236 IF ( xios_is_valid_ domain (cdid) ) THEN1238 IF ( xios_is_valid_zoom_domain (cdid) ) THEN 1237 1239 CALL xios_set_zoom_domain_attr ( cdid, ibegin=ibegin, jbegin=jbegin, ni=ni, & 1238 1240 & nj=nj) … … 1326 1328 IF ( xios_is_valid_gridgroup(cdid) ) CALL xios_set_gridgroup_attr( cdid, mask=mask ) 1327 1329 #else 1328 IF ( xios_is_valid_grid (cdid) ) CALL xios_set_grid_attr ( cdid, mask 3=mask )1329 IF ( xios_is_valid_gridgroup(cdid) ) CALL xios_set_gridgroup_attr( cdid, mask 3=mask )1330 IF ( xios_is_valid_grid (cdid) ) CALL xios_set_grid_attr ( cdid, mask_3D=mask ) 1331 IF ( xios_is_valid_gridgroup(cdid) ) CALL xios_set_gridgroup_attr( cdid, mask_3D=mask ) 1330 1332 #endif 1331 1333 CALL xios_solve_inheritance() … … 1388 1390 END SELECT 1389 1391 ! 1392 #if ! defined key_xios2 1390 1393 CALL iom_set_domain_attr( "grid_"//cdgrd , mask = RESHAPE(zmask(nldi:nlei,nldj:nlej,1),(/ni,nj /)) /= 0. ) 1394 #else 1395 CALL iom_set_domain_attr( "grid_"//cdgrd , mask = RESHAPE(zmask(nldi:nlei,nldj:nlej,1),(/ni*nj /)) /= 0. ) 1396 #endif 1391 1397 CALL iom_set_grid_attr ( "grid_"//cdgrd//"_3D", mask = RESHAPE(zmask(nldi:nlei,nldj:nlej,:),(/ni,nj,jpk/)) /= 0. ) 1392 1398 ENDIF … … 1532 1538 #else 1533 1539 ! Pas teste : attention aux indices ! 1534 CALL iom_set_domain_attr(" ptr", ni_glo=jpiglo, nj_glo=jpjglo, ibegin=nimpp+nldi-2, jbegin=njmpp+nldj-2, ni=ni, nj=nj)1535 CALL iom_set_domain_attr(" ptr", data_dim=2, data_ibegin = 1-nldi, data_ni = jpi, data_jbegin = 1-nldj, data_nj = jpj)1536 CALL iom_set_domain_attr(" ptr", lonvalue = zlon, &1540 CALL iom_set_domain_attr("gznl", ni_glo=jpiglo, nj_glo=jpjglo, ibegin=nimpp+nldi-2, jbegin=njmpp+nldj-2, ni=ni, nj=nj) 1541 CALL iom_set_domain_attr("gznl", data_dim=2, data_ibegin = 1-nldi, data_ni = jpi, data_jbegin = 1-nldj, data_nj = jpj) 1542 CALL iom_set_domain_attr("gznl", lonvalue = zlon, & 1537 1543 & latvalue = RESHAPE(plat(nldi:nlei, nldj:nlej),(/ ni*nj /))) 1538 CALL iom_set_zoom_domain_attr ( 'ptr', ibegin=ix, nj=jpjglo)1544 CALL iom_set_zoom_domain_attr ("ptr", ibegin=ix-1, jbegin=0, ni=1, nj=jpjglo) 1539 1545 #endif 1540 1546 … … 1552 1558 REAL(wp), DIMENSION(1) :: zz = 1. 1553 1559 !!---------------------------------------------------------------------- 1560 #if ! defined key_xios2 1554 1561 CALL iom_set_domain_attr('scalarpoint', ni_glo=jpnij, nj_glo=1, ibegin=narea, jbegin=1, ni=1, nj=1) 1562 #else 1563 CALL iom_set_domain_attr('scalarpoint', ni_glo=jpnij, nj_glo=1, ibegin=narea-1, jbegin=0, ni=1, nj=1) 1564 #endif 1555 1565 CALL iom_set_domain_attr('scalarpoint', data_dim=2, data_ibegin = 1, data_ni = 1, data_jbegin = 1, data_nj = 1) 1556 1566 … … 1778 1788 idx = INDEX(clname,'@freq@') + INDEX(clname,'@FREQ@') 1779 1789 DO WHILE ( idx /= 0 ) 1780 IF ( output_freq%hour /= 0 ) THEN 1790 IF ( output_freq%timestep /= 0) THEN 1791 WRITE(clfreq,'(I18,A2)')INT(output_freq%timestep),'ts' 1792 itrlen = LEN_TRIM(ADJUSTL(clfreq)) 1793 ELSE IF ( output_freq%hour /= 0 ) THEN 1781 1794 WRITE(clfreq,'(I19,A1)')INT(output_freq%hour),'h' 1782 1795 itrlen = LEN_TRIM(ADJUSTL(clfreq))
Note: See TracChangeset
for help on using the changeset viewer.