diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d76a8f25..c310110ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ option(ENABLE_DOCS "Enable generation of doxygen-based documentation." OFF) # Determine whether or not to generate documentation. if(ENABLE_DOCS) find_package(Doxygen REQUIRED) - add_subdirectory(docs) + add_subdirectory(docs) endif() # Enable CI build & unit testing: @@ -38,6 +38,7 @@ if(MOVING_NEST) set(MOVING_NEST ON) endif() add_subdirectory(atmos_cubed_sphere) +target_compile_definitions(fv3 PRIVATE BYPASS_BREED_SLP_INLINE) ############################################################################### ### fv3atm diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 0301022fc..97114888f 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 0301022fc73b23f20b42b52e999fa47752708ef0 +Subproject commit 97114888f529c2df70ed4a350fd2428df74839ff diff --git a/io/post_fv3.F90 b/io/post_fv3.F90 index e00accfa0..c0ba56dda 100644 --- a/io/post_fv3.F90 +++ b/io/post_fv3.F90 @@ -136,7 +136,7 @@ subroutine post_run_fv3(wrt_int_state,grid_id,mype,mpicomp,lead_write, & wrt_int_state%out_grid_info(grid_id)%jm, & wrt_int_state%out_grid_info(grid_id)%lm, & mype,wrttasks_per_group,lead_write, & - mpicomp,jts,jte,jstagrp,jendgrp,its,ite,istagrp,iendgrp) + mpicomp%mpi_val,jts,jte,jstagrp,jendgrp,its,ite,istagrp,iendgrp) ! !----------------------------------------------------------------------- !*** read namelist for pv,th,po