Clean up utils directory (#715)

* consolidated files for degrib2 * temporarily disable test * combined some files for cnvgrib * merge mkfldsep into tocgrib * subroutines for degrib2 used separately in test, combined into their own file --------- Co-authored-by: Edward Hartnett <[email protected]>
NOAA-EMC · Jun 14, 2024 · 65bf7b3 · 65bf7b3
1 parent d8a0c43
commit 65bf7b3
Show file tree

Hide file tree

Showing 15 changed files with 3,085 additions and 3,030 deletions.
diff --git a/test_utils/CMakeLists.txt b/test_utils/CMakeLists.txt
@@ -5,8 +5,7 @@
 
 if(BUILD_4)
   # This fortran test is for the internals of degrib2.
-  add_executable(test_degrib2_int test_degrib2_int.F90 ${CMAKE_SOURCE_DIR}/utils/prlevel.F90
-    ${CMAKE_SOURCE_DIR}/utils/prvtime.F90)
+  add_executable(test_degrib2_int test_degrib2_int.F90 ${CMAKE_SOURCE_DIR}/utils/prgrib2.F90)
   target_link_libraries(test_degrib2_int PUBLIC ${PROJECT_NAME}_4)
   add_test(NAME test_degrib2_int COMMAND test_degrib2_int)
 endif()

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
@@ -31,14 +31,12 @@ if (BUILD_D)
 endif()
 
 if (BUILD_4)
-  add_executable(cnvgrib cnv12.F90 cnv22.F90 gds2gdt.F90 makepdsens.F90
-  pds2pdtens.F90 putgbexn.F90 cnv21.F90 cnvgrib.F90 gdt2gds.F90
-  makepds.F90 pds2pdt.F90 setbit.F90)
+  add_executable(cnvgrib cnv12.F90 cnv22.F90 cnv21.F90 cnvgrib.F90)
   target_link_libraries(cnvgrib PUBLIC ${PROJECT_NAME}_4)
   target_link_libraries(cnvgrib PRIVATE bacio::bacio w3emc::w3emc_4
     ${JASPER_LIBRARIES} PNG::PNG ${ZLIB_LIBRARY})
 
-  add_executable(degrib2 degrib2.F90 prlevel.F90 prvtime.F90)
+  add_executable(degrib2 prgrib2.F90 degrib2.F90)
   target_link_libraries(degrib2 PUBLIC ${PROJECT_NAME}_4)
   target_link_libraries(degrib2 PRIVATE bacio::bacio w3emc::w3emc_4
     ${JASPER_LIBRARIES} PNG::PNG ${ZLIB_LIBRARY})