Skip to content

Commit

Permalink
fixed bundle io tests
Browse files Browse the repository at this point in the history
  • Loading branch information
bena-nasa committed Jun 13, 2022
1 parent 0ec8c59 commit f114273
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Enable GCM run test in CircleCI (1-hour, no ExtData)
- Added monotonic regridding option
- Make availalbe to History and ExtData2G all supported regridding methods
- Fix bundleio tests

### Changed

Expand Down
4 changes: 2 additions & 2 deletions base/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ ecbuild_add_executable (
set_target_properties(${TESTIO} PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY})

add_test(NAME bundleio_tests_latlon
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${TESTIO} -nx 2 -ny 1 -ogrid PC90x47-DE)
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${TESTIO} -nx 2 -ny 1 -ogrid PC90x47-DE -o file1_ll.nc4)

add_test(NAME bundleio_tests_cube
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 6 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${TESTIO} -nx 1 -ny 6 -ogrid PE12x72-CF)
COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 6 ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${TESTIO} -nx 1 -ny 6 -ogrid PE12x72-CF -o file_cs.nc4)

add_dependencies(build-tests ${TESTIO})

3 changes: 2 additions & 1 deletion base/tests/mapl_bundleio_test.F90
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ subroutine main()
case('-ny')
call get_command_argument(i+1,astr)
read(astr,*)ny
case('-o')
call get_command_argument(i+1,filename)
end select
enddo

Expand Down Expand Up @@ -157,7 +159,6 @@ subroutine main()
call MAPL_FieldBundleAdd(bundle,field,__RC__)


filename="temp_file.nc4"
call newWriter%create_from_bundle(bundle,clock,filename,rc=status)
_VERIFY(status)
call newWriter%write_to_file(rc=status)
Expand Down

0 comments on commit f114273

Please sign in to comment.