Enhancement: WRF CMake Changes (#739)

* Renaming .F files to .F90

* Fixing dependency for nudging build

* Moving files from .f90 -> .F90

* Renaming .F to .F90 coupled WRF files

* Renaming .F to .F90 coupled WRF files

* CMake: bringing over some changes from WRF CMake changes. Tabs to spaces and enforcing uniform style guide

* Bringing over a few edits to some CMakeLists.txt files from the WRF PR#2009

src/CPL/NoahMP_cpl/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_library(hydro_noahmp_cpl STATIC
-	module_hrldas_HYDRO.F
-	hrldas_drv_HYDRO.F
+        module_hrldas_HYDRO.F
+        hrldas_drv_HYDRO.F
 )
 
 target_link_libraries(hydro_noahmp_cpl PUBLIC hydro_mpp)

src/CPL/WRF_cpl/Makefile

@@ -1,7 +1,7 @@
 # Makefile 
 #
 .SUFFIXES:
-.SUFFIXES: .o .F
+.SUFFIXES: .o .F90
 
 
 
@@ -15,9 +15,9 @@ OBJS = \
 	wrf_drv_HYDRO.o    
 all:	$(OBJS) 
 
-.F.o:
+.F90.o:
 	@echo ""
-	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(MODFLAG) -I$(WRF_ROOT)/frame -I$(WRF_ROOT)/main -I$(WRF_ROOT)/external/esmf_time_f90 $(*).F
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(MODFLAG) -I$(WRF_ROOT)/frame -I$(WRF_ROOT)/main -I$(WRF_ROOT)/external/esmf_time_f90 $(*).F90
 	@echo ""
 	ar -r ../../lib/libHYDRO.a $(@)
 

src/Data_Rec/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_library(hydro_data_rec STATIC
-	module_gw_gw2d_data.F
-	module_rt_inc.F
-	module_namelist_inc.F
-	module_RT_data.F
-	module_namelist.F
+        module_gw_gw2d_data.F90
+        module_rt_inc.F90
+        module_namelist_inc.F90
+        module_RT_data.F90
+        module_namelist.F90
 )

src/Data_Rec/Makefile

@@ -1,7 +1,7 @@
 # Makefile
 #
 .SUFFIXES:
-.SUFFIXES: .o .F
+.SUFFIXES: .o .F90
 
 include ../macros
 
@@ -14,9 +14,9 @@ OBJS = \
 
 all:	$(OBJS)
 
-.F.o:
+.F90.o:
 	@echo ""
-	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I../mod $(*).F
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I../mod $(*).F90
 	@echo ""
 	ar -r ../lib/libHYDRO.a $(@)
 	cp *.mod ../mod

src/Debug_Utilities/CMakeLists.txt

@@ -1,4 +1,4 @@
 # build the version static library
 add_library(hydro_debug_utils STATIC
-	debug_dump_variable.F
+        debug_dump_variable.F90
 )

src/Debug_Utilities/Makefile

@@ -1,18 +1,18 @@
-# Makefile 
+# Makefile
 #
 .SUFFIXES:
-.SUFFIXES: .o .F
+.SUFFIXES: .o .F90
 
 include ../macros
 
 OBJS = \
-	debug_dump_variable.o 
+	debug_dump_variable.o
 
-all:	$(OBJS) 
+all:	$(OBJS)
 
-.F.o:
+.F90.o:
 	@echo ""
-	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I../mod $(*).F
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I../mod $(*).F90
 	@echo ""
 	ar -r ../lib/libHYDRO.a $(@)
 	cp *.mod ../mod

src/HYDRO_drv/CMakeLists.txt

@@ -1,13 +1,15 @@
 # build the version static library
 add_library(hydro_driver STATIC
-	module_HYDRO_drv.F
+        module_HYDRO_drv.F90
 )
 
-target_link_libraries(hydro_driver PUBLIC hydro_mpp)
-target_link_libraries(hydro_driver PUBLIC hydro_data_rec)
-target_link_libraries(hydro_driver PUBLIC hydro_routing)
-target_link_libraries(hydro_driver PUBLIC hydro_debug_utils)
+target_link_libraries(hydro_driver PUBLIC
+        hydro_mpp
+        hydro_data_rec
+        hydro_routing
+        hydro_debug_utils
+)
 
-if (WRF_HYDRO_NUDGING STREQUAL "1")
-	target_link_libraries(hydro_driver PUBLIC hydro_nudging)
-endif (WRF_HYDRO_NUDGING STREQUAL "1")
+if(WRF_HYDRO_NUDGING STREQUAL "1")
+        target_link_libraries(hydro_driver PUBLIC hydro_nudging)
+endif()

src/HYDRO_drv/Makefile

@@ -1,17 +1,17 @@
-# Makefile 
+# Makefile
 #
 .SUFFIXES:
-.SUFFIXES: .o .F
+.SUFFIXES: .o .F90
 
 include ../macros
 
 OBJS = \
 	module_HYDRO_drv.o
-all:	$(OBJS) 
+all:	$(OBJS)
 
-.F.o:
+.F90.o:
 	@echo ""
-	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I$(NETCDFINC) -I../mod $(*).F
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I$(NETCDFINC) -I../mod $(*).F90
 	@echo ""
 	ar -r ../lib/libHYDRO.a $(@)
 	cp *.mod ../mod

src/IO/CMakeLists.txt

@@ -1,4 +1,8 @@
 # build the orchestrator static library
 add_library(hydro_netcdf_layer STATIC
-        netcdf_layer.f90
-        )
+        netcdf_layer.F90
+)
+
+target_link_libraries(hydro_netcdf_layer
+        MPI::MPI_Fortran
+)

src/IO/Makefile

@@ -1,19 +1,19 @@
-# Makefile 
+# Makefile
 #
 .SUFFIXES:
-.SUFFIXES: .o .f90
+.SUFFIXES: .o .F90
 
 include ../macros
 
 OBJS = \
 	netcdf_layer.o
 all:	$(OBJS)
 
-.f90.o:
+.F90.o:
 	@echo ""
 # $(CPP) $(CPPFLAGS) -I$(NETCDFINC) $(*).F > $(*).f
 #	$(COMPILER90) -o $(@) $(F90FLAGS) $(MODFLAG) -I../mod $(*).f
-	$(COMPILER90) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I$(NETCDFINC) -I../mod $(*).f90
+	$(COMPILER90) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I$(NETCDFINC) -I../mod $(*).F90
 #	$(RMD) $(*).f
 	@echo ""
 	ar -r ../lib/libHYDRO.a $(@)

src/Land_models/Noah/Noah/CMakeLists.txt

@@ -1,4 +1,4 @@
 add_library(noah STATIC
-	module_sf_urban.F
-	module_sf_noahlsm.F
+        module_sf_urban.F
+        module_sf_noahlsm.F
 )

src/Land_models/Noah/Utility_routines/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_library(noah_util STATIC
-	kwm_string_utilities.F
-	module_date_utilities.F
-	module_model_constants.F
-	module_Noahlsm_utility.F
-	module_sfcdif_wrf.F
+        kwm_string_utilities.F
+        module_date_utilities.F
+        module_model_constants.F
+        module_Noahlsm_utility.F
+        module_sfcdif_wrf.F
 )

src/Land_models/NoahMP/Utility_routines/CMakeLists.txt

@@ -1,8 +1,8 @@
 add_library(noahmp_util STATIC
-	kwm_string_utilities.F
-	module_date_utilities.F
-	module_model_constants.F
-	module_wrf_utilities.F
+        kwm_string_utilities.F
+        module_date_utilities.F
+        module_model_constants.F
+        module_wrf_utilities.F
 )
 
 target_link_libraries(noahmp_util PUBLIC hydro_mpp)

src/Land_models/NoahMP/phys/CMakeLists.txt

@@ -1,10 +1,10 @@
 add_subdirectory("surfex")
 
 add_library(noahmp_phys STATIC
-	module_sf_noahmpdrv.F
-	module_sf_noahmp_glacier.F
-	module_sf_noahmp_groundwater.F
-	module_sf_noahmplsm.F
+        module_sf_noahmpdrv.F
+        module_sf_noahmp_glacier.F
+        module_sf_noahmp_groundwater.F
+        module_sf_noahmplsm.F
 )
 
 target_link_libraries(noahmp_phys snowcro crocus_surfex)

src/MPP/CMakeLists.txt

@@ -1,9 +1,12 @@
 add_library(hydro_mpp STATIC
-	CPL_WRF.F
-	module_mpp_GWBUCKET.F
-	module_mpp_ReachLS.F
-	mpp_land.F
-	hashtable.F
+        CPL_WRF.F90
+        module_mpp_GWBUCKET.F90
+        module_mpp_ReachLS.F90
+        mpp_land.F90
+        hashtable.F90
 )
 
-target_link_libraries(hydro_mpp ${MPI_Fortran_LIBRARIES})
+target_link_libraries(hydro_mpp MPI::MPI_Fortran)
+target_include_directories(hydro_mpp PUBLIC
+        ${MPI_Fortran_MODULE_DIR}
+)

src/MPP/CPL_WRF.F → src/MPP/CPL_WRF.F90

@@ -83,12 +83,12 @@ subroutine CPL_LAND_INIT(istart,iend,jstart,jend)
       dims(0) = 0
       dims(1) = 0
       do xx=1,total_pe_num
-	if(node_info(2,xx) .eq. (-1)) then
-	  dims(0) = dims(0)+1
-	endif
-	if(node_info(4,xx) .eq. (-1)) then
-	  dims(1) = dims(1)+1
-	endif
+        if(node_info(2,xx) .eq. (-1)) then
+          dims(0) = dims(0)+1
+        endif
+        if(node_info(4,xx) .eq. (-1)) then
+          dims(1) = dims(1)+1
+        endif
       enddo
 
       ndim = 2

src/MPP/Makefile

@@ -1,45 +1,45 @@
-# Makefile 
+# Makefile
 #
 .SUFFIXES:
-.SUFFIXES: .o .F
+.SUFFIXES: .o .F90
 
 include ../macros
 
 OBJS =  hashtable.o CPL_WRF.o mpp_land.o module_mpp_ReachLS.o module_mpp_GWBUCKET.o
 
 all:	$(OBJS)
 
-hashtable.o: hashtable.F
+hashtable.o: hashtable.F90
 	@echo ""
 	$(RMD) $(*).o $(*).mod $(*).stb *~
-	$(COMPILER90) $(F90FLAGS) $(LDFLAGS) -c $(*).F
+	$(COMPILER90) $(F90FLAGS) $(LDFLAGS) -c $(*).F90
 	cp hashtable.mod ../mod
 	ar -r ../lib/libHYDRO.a $(@)
 
-mpp_land.o: mpp_land.F
+mpp_land.o: mpp_land.F90
 	@echo ""
 	$(RMD) $(*).o $(*).mod $(*).stb *~
-	$(COMPILER90) $(F90FLAGS) $(LDFLAGS) -c $(*).F
+	$(COMPILER90) $(F90FLAGS) $(LDFLAGS) -c $(*).F90
 	ar -r ../lib/libHYDRO.a $(@)
 
-CPL_WRF.o: CPL_WRF.F
+CPL_WRF.o: CPL_WRF.F90
 	@echo ""
 	$(RMD) $(*).o $(*).mod $(*).stb *~
-	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) $(*).F
-        
-	$(COMPILER90) $(F90FLAGS) $(LDFLAGS) -c $(*).F
+	$(COMPILER90) $(CPPINVOKE) $(CPPFLAGS) -I$(NETCDFINC) -o $(@) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) $(*).F90
+
+	$(COMPILER90) $(F90FLAGS) $(LDFLAGS) -c $(*).F90
 	ar -r ../lib/libHYDRO.a $(@)
 
-module_mpp_ReachLS.o: module_mpp_ReachLS.F
+module_mpp_ReachLS.o: module_mpp_ReachLS.F90
 	@echo ""
 	$(RMD) $(*).o $(*).mod $(*).stb *~
-	$(COMPILER90) $(F90FLAGS) $(LDFLAGS) -c $(*).F
+	$(COMPILER90) $(F90FLAGS) $(LDFLAGS) -c $(*).F90
 	ar -r ../lib/libHYDRO.a $(@)
 
-module_mpp_GWBUCKET.o: module_mpp_GWBUCKET.F
+module_mpp_GWBUCKET.o: module_mpp_GWBUCKET.F90
 	@echo ""
 	$(RMD) $(*).o $(*).mod $(*).stb *~
-	$(COMPILER90) $(F90FLAGS) $(LDFLAGS) -c $(*).F
+	$(COMPILER90) $(F90FLAGS) $(LDFLAGS) -c $(*).F90
 	ar -r ../lib/libHYDRO.a $(@)
 
 clean:

src/OrchestratorLayer/CMakeLists.txt

@@ -1,12 +1,16 @@
 # build the orchestrator static library
 add_library(hydro_orchestrator STATIC
-        config.f90
-        io_manager.f90
-        orchestrator.f90
-        )
+        config.F90
+        io_manager.F90
+        orchestrator.F90
+)
 
-add_dependencies(hydro_orchestrator hydro_netcdf_layer)
-add_dependencies(hydro_orchestrator hydro_utils)
+add_dependencies(hydro_orchestrator
+        hydro_netcdf_layer
+        hydro_utils
+)
 
-target_link_libraries(hydro_orchestrator PUBLIC hydro_netcdf_layer)
-target_link_libraries(hydro_orchestrator PUBLIC hydro_utils)
+target_link_libraries(hydro_orchestrator PRIVATE
+        hydro_netcdf_layer
+        hydro_utils
+)

src/OrchestratorLayer/Makefile

@@ -1,7 +1,7 @@
-# Makefile 
+# Makefile
 #
 .SUFFIXES:
-.SUFFIXES: .o .f90
+.SUFFIXES: .o .F90
 
 include ../macros
 
@@ -20,10 +20,10 @@ all:	$(OBJS)
 #	@echo ""
 #	cp *.mod ../mod
 
-.f90.o:
+.F90.o:
 	@echo "Orchestrator Makefile:"
 #	$(COMPILER90) -o $(@) $(F90FLAGS) $(MODFLAG) $(*).f
-	$(COMPILER90) $(CPPINVOKE) -o $(@) $(CPPFLAGS) $(FPPFLAGS) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I$(NETCDFINC) $(*).f90
+	$(COMPILER90) $(CPPINVOKE) -o $(@) $(CPPFLAGS) $(FPPFLAGS) $(F90FLAGS) $(LDFLAGS) $(MODFLAG) -I$(NETCDFINC) $(*).F90
 #	$(RMD) $(*).f
 	@echo ""
 	ar -r ../lib/libHYDRO.a $(@)
@@ -36,5 +36,5 @@ io_manager.o: ../IO/netcdf_layer.o
 
 orchestrator.o: io_manager.o config.o
 
-clean:	
+clean:
 	rm -f *.o *.mod *.stb *~ *.f