New IO capabilities via FieldAPI IO #121
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,6 +31,7 @@ macro( cloudsc_add_cuda_exe TARGET DRIVER KERNEL ) | |
| $<${HAVE_HDF5}:hdf5::hdf5> | ||
| $<${HAVE_SERIALBOX}:Serialbox::Serialbox_C> | ||
| $<${HAVE_OMP}:OpenMP::OpenMP_C> | ||
| $<${HAVE_MPI}:MPI::MPI_C> | ||
|
piotrows marked this conversation as resolved.
|
||
| CUDA::cudart | ||
| DEFINITIONS | ||
| ${CLOUDSC_DEFINITIONS} | ||
|
|
@@ -40,6 +41,8 @@ macro( cloudsc_add_cuda_exe TARGET DRIVER KERNEL ) | |
| target_compile_options( ${TARGET}-${prec}-lib | ||
| PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:SHELL:${CLOUDSC_CUDA_OPT_FLAGS} ${CLOUDSC_CUDA_FLAGS}> | ||
| ) | ||
| # target_link_libraries(${TARGET}-${prec}-lib PRIVATE $<${HAVE_MPI}:MPI::MPI_C>) | ||
|
|
||
| set_target_properties( ${TARGET}-${prec}-lib | ||
| PROPERTIES CUDA_SEPARABLE_COMPILATION ON | ||
| ) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -85,6 +85,11 @@ cloudsc_add_fortran_exe( | |
|
|
||
| # Default Fortran driver using FIELD_API | ||
| if( HAVE_FIELD_API ) | ||
| if(NOT HAVE_MPI AND FIELD_API_ENABLE_IO_PARALLEL STREQUAL "ON") | ||
| ecbuild_error("--with-field-api-io-parallel=ON was requested without --with-mpi=ON") | ||
| elseif(HAVE_MPI AND FIELD_API_ENABLE_IO_SERIAL STREQUAL "ON") | ||
| ecbuild_error("--with-field-api-io-serial=ON was requested but --with-mpi=ON") | ||
| endif() | ||
| cloudsc_add_fortran_exe( | ||
| TARGET dwarf-cloudsc-fortran-field | ||
| DRIVER cloudsc_driver_field_mod.F90 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,6 @@ MODULE CLOUDSC_DRIVER_FIELD_MOD | |
| SUBROUTINE CLOUDSC_DRIVER_FIELD( & | ||
| & NUMOMP, NPROMA, NLEV, NGPTOT, NGPTOTG, KFLDX, PTSPHY, PAUX, FLUX, & | ||
| & TENDENCY_TMP, TENDENCY_LOC, YDOMCST, YDOETHF, YDECLDP) | ||
|
|
||
| USE YOECLDP , ONLY : TECLDP | ||
| USE YOMCST , ONLY : TOMCST | ||
|
|
@@ -50,6 +49,13 @@ SUBROUTINE CLOUDSC_DRIVER_FIELD( & | |
| write(0,1003) NUMPROC,NUMOMP,NGPTOTG,NPROMA,NGPBLKS | ||
| end if | ||
|
|
||
| #ifdef FIELD_API_IO | ||
|
Collaborator
There was a problem hiding this comment. To me, the option to write the input state to file would be a run-time option, and not a compile-time option. How about we rename Similar we could then write the output by implementing the same boilerplate on
Contributor
Author
There was a problem hiding this comment.
Could be done but what we are doing at the moment is testing (write+read, not a write alone).
Contributor
Author
There was a problem hiding this comment.
Well, this is an option, but then it looses the virtue of a top-level, clear example that teaches the FieldAPI IO. So it really depends if we want expand CLOUDSC capabilities or we would rather prefer a FA IO tutorial, or perhaps both.
Collaborator
There was a problem hiding this comment.
I disagree on this one - having a pure procedural test routine does not make a good "tutorial". Instead, the derived types
Collaborator
There was a problem hiding this comment. How about splitting the two into a write and read routine and calling them in this order from here? For a full-on switch to HDF5 as inputs, we would need to replicate the inputs in a third format commited to the repository. I think that is a good idea but could also be tackled in a follow-on PR maybe? |
||
| CALL WRITE_FIELD_HDF5(NUMOMP, NPROMA, NLEV, NGPTOT, NGPTOTG, KFLDX, PTSPHY, PAUX, & | ||
| & TENDENCY_TMP, TENDENCY_LOC) | ||
| CALL READ_FIELD_HDF5(NUMOMP, NPROMA, NLEV, NGPTOT, NGPTOTG, KFLDX, PTSPHY, PAUX, & | ||
| & TENDENCY_TMP, TENDENCY_LOC) | ||
| #endif | ||
|
|
||
| ! Global timer for the parallel region | ||
| CALL TIMER%START(NUMOMP) | ||
|
|
||
|
|
@@ -115,6 +121,118 @@ SUBROUTINE CLOUDSC_DRIVER_FIELD( & | |
| CALL TIMER%PRINT_PERFORMANCE(NPROMA, NGPBLKS, NGPTOT) | ||
|
|
||
| END SUBROUTINE CLOUDSC_DRIVER_FIELD | ||
| #ifdef FIELD_API_IO | ||
| SUBROUTINE WRITE_FIELD_HDF5( & | ||
| & NUMOMP, NPROMA, NLEV, NGPTOT, NGPTOTG, KFLDX, PTSPHY, PAUX, & | ||
| & TENDENCY_TMP, TENDENCY_LOC) | ||
|
|
||
| USE FIELD_HDF5_MODULE, ONLY: WRITE_HDF5_PERRANK_DATA | ||
| INTEGER(KIND=JPIM) ,INTENT(IN) :: NUMOMP, NPROMA, NLEV, NGPTOT, NGPTOTG | ||
| INTEGER(KIND=JPIM) ,INTENT(IN) :: KFLDX | ||
| REAL(KIND=JPRB) ,INTENT(IN) :: PTSPHY ! PHYSICS TIMESTEP | ||
| TYPE(CLOUDSC_AUX_TYPE) ,INTENT(IN) :: PAUX | ||
| TYPE(CLOUDSC_STATE_TYPE) ,INTENT(IN) :: TENDENCY_TMP | ||
| TYPE(CLOUDSC_STATE_TYPE) ,INTENT(IN) :: TENDENCY_LOC | ||
|
|
||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PT, "cloudsc_data", "PT", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PQ, "cloudsc_data", "PQ", HDFEXISTS=.TRUE.) | ||
|
|
||
| CALL WRITE_HDF5_PERRANK_DATA(TENDENCY_TMP%F_T, "cloudsc_data", "TEND_TMP_T", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(TENDENCY_TMP%F_Q, "cloudsc_data", "TEND_TMP_Q", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(TENDENCY_TMP%F_A, "cloudsc_data", "TEND_TMP_A", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(TENDENCY_TMP%F_CLD, "cloudsc_data", "TEND_TMP_CLD", HDFEXISTS=.TRUE.) | ||
|
|
||
| CALL WRITE_HDF5_PERRANK_DATA(TENDENCY_LOC%F_T, "cloudsc_data", "TEND_LOC_T", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(TENDENCY_LOC%F_Q, "cloudsc_data", "TEND_LOC_Q", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(TENDENCY_LOC%F_A, "cloudsc_data", "TEND_LOC_A", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(TENDENCY_LOC%F_CLD, "cloudsc_data", "TEND_LOC_CLD", HDFEXISTS=.TRUE.) | ||
|
|
||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PVFA, "cloudsc_data", "PVFA", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PVFL, "cloudsc_data", "PVFL", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PVFI, "cloudsc_data", "PVFI", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PDYNA, "cloudsc_data", "PDYNA", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PDYNL, "cloudsc_data", "PDYNL", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PDYNI, "cloudsc_data", "PDYNI", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PHRSW, "cloudsc_data", "PHRSW", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PHRLW, "cloudsc_data", "PHRLW", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PVERVEL, "cloudsc_data", "PVERVEL", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PAP, "cloudsc_data", "PAP", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PAPH, "cloudsc_data", "PAPH", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PLSM, "cloudsc_data", "PLSM" , HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_LDCUM, "cloudsc_data", "LDCUM", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_KTYPE, "cloudsc_data", "KTYPE", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PLU, "cloudsc_data", "PLU", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PLUDE, "cloudsc_data", "PLUDE", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PSNDE, "cloudsc_data", "PSNDE", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PMFU, "cloudsc_data", "PMFU", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PMFD, "cloudsc_data", "PMFD", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PA, "cloudsc_data", "PA", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PCLV, "cloudsc_data", "PCLV", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PSUPSAT, "cloudsc_data", "PSUPSAT", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PLCRIT_AER, "cloudsc_data", "PLCRIT_AER", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PICRIT_AER, "cloudsc_data", "PICRIT_AER", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PRE_ICE, "cloudsc_data", "PRE_ICE_AER", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PCCN, "cloudsc_data", "PCCN", HDFEXISTS=.TRUE.) | ||
| CALL WRITE_HDF5_PERRANK_DATA(PAUX%F_PNICE, "cloudsc_data", "PNICE", HDFEXISTS=.TRUE.) | ||
|
|
||
| END SUBROUTINE WRITE_FIELD_HDF5 | ||
|
|
||
| SUBROUTINE READ_FIELD_HDF5( & | ||
| & NUMOMP, NPROMA, NLEV, NGPTOT, NGPTOTG, KFLDX, PTSPHY, PAUX, & | ||
| & TENDENCY_TMP, TENDENCY_LOC) | ||
|
|
||
| USE FIELD_HDF5_MODULE, ONLY: READ_HDF5_PERRANK_DATA | ||
| INTEGER(KIND=JPIM) :: NUMOMP, NPROMA, NLEV, NGPTOT, NGPTOTG | ||
| INTEGER(KIND=JPIM) :: KFLDX | ||
| REAL(KIND=JPRB) :: PTSPHY ! PHYSICS TIMESTEP | ||
| TYPE(CLOUDSC_AUX_TYPE) :: PAUX | ||
| TYPE(CLOUDSC_STATE_TYPE) :: TENDENCY_TMP | ||
| TYPE(CLOUDSC_STATE_TYPE) :: TENDENCY_LOC | ||
|
|
||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PT, "cloudsc_data", "PT", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PQ, "cloudsc_data", "PQ", HDFEXISTS=.TRUE.) | ||
|
|
||
| CALL READ_HDF5_PERRANK_DATA(TENDENCY_TMP%F_T, "cloudsc_data", "TEND_TMP_T", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(TENDENCY_TMP%F_Q, "cloudsc_data", "TEND_TMP_Q", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(TENDENCY_TMP%F_A, "cloudsc_data", "TEND_TMP_A", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(TENDENCY_TMP%F_CLD, "cloudsc_data", "TEND_TMP_CLD", HDFEXISTS=.TRUE.) | ||
|
|
||
| CALL READ_HDF5_PERRANK_DATA(TENDENCY_LOC%F_T, "cloudsc_data", "TEND_LOC_T", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(TENDENCY_LOC%F_Q, "cloudsc_data", "TEND_LOC_Q", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(TENDENCY_LOC%F_A, "cloudsc_data", "TEND_LOC_A", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(TENDENCY_LOC%F_CLD, "cloudsc_data", "TEND_LOC_CLD", HDFEXISTS=.TRUE.) | ||
|
|
||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PVFA, "cloudsc_data", "PVFA", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PVFL, "cloudsc_data", "PVFL", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PVFI, "cloudsc_data", "PVFI", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PDYNA, "cloudsc_data", "PDYNA", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PDYNL, "cloudsc_data", "PDYNL", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PDYNI, "cloudsc_data", "PDYNI", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PHRSW, "cloudsc_data", "PHRSW", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PHRLW, "cloudsc_data", "PHRLW", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PVERVEL, "cloudsc_data", "PVERVEL", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PAP, "cloudsc_data", "PAP", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PAPH, "cloudsc_data", "PAPH", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PLSM, "cloudsc_data", "PLSM" , HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_LDCUM, "cloudsc_data", "LDCUM", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_KTYPE, "cloudsc_data", "KTYPE", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PLU, "cloudsc_data", "PLU", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PLUDE, "cloudsc_data", "PLUDE", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PSNDE, "cloudsc_data", "PSNDE", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PMFU, "cloudsc_data", "PMFU", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PMFD, "cloudsc_data", "PMFD", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PA, "cloudsc_data", "PA", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PCLV, "cloudsc_data", "PCLV", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PSUPSAT, "cloudsc_data", "PSUPSAT", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PLCRIT_AER, "cloudsc_data", "PLCRIT_AER", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PICRIT_AER, "cloudsc_data", "PICRIT_AER", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PRE_ICE, "cloudsc_data", "PRE_ICE_AER", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PCCN , "cloudsc_data", "PCCN", HDFEXISTS=.TRUE.) | ||
| CALL READ_HDF5_PERRANK_DATA(PAUX%F_PNICE, "cloudsc_data", "PNICE", HDFEXISTS=.TRUE.) | ||
|
|
||
| END SUBROUTINE READ_FIELD_HDF5 | ||
| #endif | ||
|
|
||
|
|
||
| END MODULE CLOUDSC_DRIVER_FIELD_MOD | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still curious what makes this necessary?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As stated earlier, dependence of hdf5.h on mpi.h. I am not sure if CXX will be needed here, but it is hard to exclude at the moment.