Cleanup CMake build, and rename test directories.

Author: nusbaume

src/physics/utils/CMakeLists.txt

@@ -14,6 +14,5 @@ target_link_libraries(io_reader PUBLIC
                       PIO::PIO_C
                       cam_pio_utils
                       ccpp_framework)
-#target_link_libraries(io_reader PUBLIC PIO::PIO_Fortran cam_pio_utils ccpp_framework)
 target_include_directories(io_reader PRIVATE ${CMAKE_BINARY_DIR}/ccpp_framework_stub
-                                             ${CMAKE_BINARY_DIR}/utils)
+                                             ${CMAKE_BINARY_DIR}/mock_routines)

test/unit/fortran/CMakeLists.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.18)
 
 project(CAM-SIMA-core-utils LANGUAGES Fortran C)
-#project(CAM-SIMA-core-utils LANGUAGES Fortran)
 
 option(CAM_SIMA_ENABLE_TESTS "Run pFUnit unit tests" OFF)
 option(CAM_SIMA_ENABLE_CODE_COVERAGE "Run code coverage tool" OFF)
@@ -36,17 +35,15 @@ if(CAM_SIMA_ENABLE_TESTS OR CAM_SIMA_ENABLE_CODE_COVERAGE OR CAM_SIMA_ENABLE_IO_
   endif()
   if(CAM_SIMA_ENABLE_IO_TESTS)
     find_package(MPI REQUIRED COMPONENTS Fortran C)
-    #find_package(MPI REQUIRED COMPONENTS Fortran)
     list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
     find_package(NetCDF REQUIRED COMPONENTS Fortran C)
-    #find_package(NetCDF REQUIRED COMPONENTS Fortran)
     find_package(PIO REQUIRED COMPONENTS Fortran C)
 
     add_subdirectory(ccpp_framework_stub)
-    add_subdirectory(utils)
+    add_subdirectory(mock_routines)
 
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../../src/physics/utils ${CMAKE_CURRENT_BINARY_DIR}/src/physics/utils)
 
-    add_subdirectory(src/mock_routines)
+    add_subdirectory(src/pio_reader)
   endif()
 endif()

test/unit/fortran/utils/CMakeLists.txt renamed to test/unit/fortran/mock_routines/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_library(cam_pio_utils cam_pio_utils.F90)
 target_link_libraries(cam_pio_utils PUBLIC MPI::MPI_Fortran
-	                                   #MPI::MPI_C
                                            PIO::PIO_Fortran
                                            PIO::PIO_C
                                            NetCDF::NetCDF_C

test/unit/fortran/utils/cam_pio_utils.F90 renamed to test/unit/fortran/mock_routines/cam_pio_utils.F90

@@ -1,11 +1,9 @@
 add_pfunit_ctest(pio_tests
-                 #TEST_SOURCES test_pio_read.pf test_pio_reader.pf
                  TEST_SOURCES test_pio_reader.pf
                  LINK_LIBRARIES io_reader
                                 cam_pio_utils
                                 ccpp_framework
                                 MPI::MPI_Fortran
-				#MPI::MPI_C
                                 PIO::PIO_Fortran
                                 PIO::PIO_C
                                 NetCDF::NetCDF_C

test/unit/fortran/src/mock_routines/test_pio_read.pf

@@ -29,8 +29,6 @@ subroutine test_pio_reader_open_close_file()
     !close a file successfully.
     use funit
 
-    !use mpi,           only: mpi_init
-
     use ccpp_io_reader, only: abstract_netcdf_reader_t
     use ccpp_io_reader, only: create_netcdf_reader_t
 
@@ -39,17 +37,11 @@ subroutine test_pio_reader_open_close_file()
     integer            :: errcode
     character(len=256) :: errmsg
 
-    !integer            :: mpi_ierr
-
     ! File name for testing:
     ! NOTE:  This specific file is added during the Github Actions workflow.
     character(len=*), parameter :: fname = &
     '../../../rrtmgp-data/rrtmgp-gas-sw-g112.nc'
 
-    ! Initialize MPI:
-    ! NOTE: This must be done for the first test in the test suite.
-    !call mpi_init(mpi_ierr)
-
     ! Begin test:
 
     reader = create_netcdf_reader_t()