- Timestamp:
- 2016-04-27T16:01:22+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
r6491 r6498 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 … … 1202 1200 REAL(wp), DIMENSION(:) , OPTIONAL, INTENT(in) :: lonvalue, latvalue 1203 1201 REAL(wp), DIMENSION(:,:) , OPTIONAL, INTENT(in) :: bounds_lon, bounds_lat, area 1204 LOGICAL, DIMENSION(:,:) , OPTIONAL, INTENT(in) :: mask 1202 #if ! defined key_xios2 1203 LOGICAL, DIMENSION(:,:) , OPTIONAL, INTENT(in) :: mask 1204 #else 1205 LOGICAL, DIMENSION(:) , OPTIONAL, INTENT(in) :: mask 1206 #endif 1205 1207 1206 1208 #if ! defined key_xios2 … … 1224 1226 CALL xios_set_domain_attr ( cdid, ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, jbegin=jbegin, ni=ni, nj=nj, & 1225 1227 & data_dim=data_dim, data_ibegin=data_ibegin, data_ni=data_ni, data_jbegin=data_jbegin, data_nj=data_nj , & 1226 & lonvalue_1D=lonvalue, latvalue_1D=latvalue, mask_ 2D=mask, nvertex=nvertex, bounds_lon_1D=bounds_lon,&1228 & lonvalue_1D=lonvalue, latvalue_1D=latvalue, mask_1D=mask, nvertex=nvertex, bounds_lon_1D=bounds_lon, & 1227 1229 & bounds_lat_1D=bounds_lat, area=area, type='curvilinear') 1228 1230 ENDIF … … 1230 1232 CALL xios_set_domaingroup_attr( cdid, ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, jbegin=jbegin, ni=ni, nj=nj, & 1231 1233 & data_dim=data_dim, data_ibegin=data_ibegin, data_ni=data_ni, data_jbegin=data_jbegin, data_nj=data_nj , & 1232 & lonvalue_1D=lonvalue, latvalue_1D=latvalue, mask_ 2D=mask, nvertex=nvertex, bounds_lon_1D=bounds_lon,&1234 & lonvalue_1D=lonvalue, latvalue_1D=latvalue, mask_1D=mask, nvertex=nvertex, bounds_lon_1D=bounds_lon, & 1233 1235 & bounds_lat_1D=bounds_lat, area=area, type='curvilinear' ) 1234 1236 ENDIF … … 1243 1245 INTEGER , OPTIONAL, INTENT(in) :: ibegin, jbegin, ni, nj 1244 1246 1245 IF ( xios_is_valid_ domain (cdid) ) THEN1247 IF ( xios_is_valid_zoom_domain (cdid) ) THEN 1246 1248 CALL xios_set_zoom_domain_attr ( cdid, ibegin=ibegin, jbegin=jbegin, ni=ni, & 1247 1249 & nj=nj) … … 1335 1337 IF ( xios_is_valid_gridgroup(cdid) ) CALL xios_set_gridgroup_attr( cdid, mask=mask ) 1336 1338 #else 1337 IF ( xios_is_valid_grid (cdid) ) CALL xios_set_grid_attr ( cdid, mask 3=mask )1338 IF ( xios_is_valid_gridgroup(cdid) ) CALL xios_set_gridgroup_attr( cdid, mask 3=mask )1339 IF ( xios_is_valid_grid (cdid) ) CALL xios_set_grid_attr ( cdid, mask_3D=mask ) 1340 IF ( xios_is_valid_gridgroup(cdid) ) CALL xios_set_gridgroup_attr( cdid, mask_3D=mask ) 1339 1341 #endif 1340 1342 CALL xios_solve_inheritance() … … 1397 1399 END SELECT 1398 1400 ! 1401 #if ! defined key_xios2 1399 1402 CALL iom_set_domain_attr( "grid_"//cdgrd , mask = RESHAPE(zmask(nldi:nlei,nldj:nlej,1),(/ni,nj /)) /= 0. ) 1403 #else 1404 CALL iom_set_domain_attr( "grid_"//cdgrd , mask = RESHAPE(zmask(nldi:nlei,nldj:nlej,1),(/ni*nj /)) /= 0. ) 1405 #endif 1400 1406 CALL iom_set_grid_attr ( "grid_"//cdgrd//"_3D", mask = RESHAPE(zmask(nldi:nlei,nldj:nlej,:),(/ni,nj,jpk/)) /= 0. ) 1401 1407 ENDIF … … 1541 1547 #else 1542 1548 ! Pas teste : attention aux indices ! 1543 CALL iom_set_domain_attr(" ptr", ni_glo=jpiglo, nj_glo=jpjglo, ibegin=nimpp+nldi-2, jbegin=njmpp+nldj-2, ni=ni, nj=nj)1544 CALL iom_set_domain_attr(" ptr", data_dim=2, data_ibegin = 1-nldi, data_ni = jpi, data_jbegin = 1-nldj, data_nj = jpj)1545 CALL iom_set_domain_attr(" ptr", lonvalue = zlon, &1549 CALL iom_set_domain_attr("gznl", ni_glo=jpiglo, nj_glo=jpjglo, ibegin=nimpp+nldi-2, jbegin=njmpp+nldj-2, ni=ni, nj=nj) 1550 CALL iom_set_domain_attr("gznl", data_dim=2, data_ibegin = 1-nldi, data_ni = jpi, data_jbegin = 1-nldj, data_nj = jpj) 1551 CALL iom_set_domain_attr("gznl", lonvalue = zlon, & 1546 1552 & latvalue = RESHAPE(plat(nldi:nlei, nldj:nlej),(/ ni*nj /))) 1547 CALL iom_set_zoom_domain_attr ( 'ptr', ibegin=ix, nj=jpjglo)1553 CALL iom_set_zoom_domain_attr ("ptr", ibegin=ix-1, jbegin=0, ni=1, nj=jpjglo) 1548 1554 #endif 1549 1555 … … 1561 1567 REAL(wp), DIMENSION(1) :: zz = 1. 1562 1568 !!---------------------------------------------------------------------- 1569 #if ! defined key_xios2 1563 1570 CALL iom_set_domain_attr('scalarpoint', ni_glo=jpnij, nj_glo=1, ibegin=narea, jbegin=1, ni=1, nj=1) 1571 #else 1572 CALL iom_set_domain_attr('scalarpoint', ni_glo=jpnij, nj_glo=1, ibegin=narea-1, jbegin=0, ni=1, nj=1) 1573 #endif 1564 1574 CALL iom_set_domain_attr('scalarpoint', data_dim=2, data_ibegin = 1, data_ni = 1, data_jbegin = 1, data_nj = 1) 1565 1575 … … 1787 1797 idx = INDEX(clname,'@freq@') + INDEX(clname,'@FREQ@') 1788 1798 DO WHILE ( idx /= 0 ) 1789 IF ( output_freq%hour /= 0 ) THEN 1799 IF ( output_freq%timestep /= 0) THEN 1800 WRITE(clfreq,'(I18,A2)')INT(output_freq%timestep),'ts' 1801 itrlen = LEN_TRIM(ADJUSTL(clfreq)) 1802 ELSE IF ( output_freq%hour /= 0 ) THEN 1790 1803 WRITE(clfreq,'(I19,A1)')INT(output_freq%hour),'h' 1791 1804 itrlen = LEN_TRIM(ADJUSTL(clfreq))
Note: See TracChangeset
for help on using the changeset viewer.