add_lake_20200810: Place orog, lake and inland code

in their own directories under new directory orog_mask_tools.fd. References ufs-community#111.
GeorgeGayno-NOAA · Aug 17, 2020 · 1aa9c50 · 1aa9c50
1 parent a76f303
commit 1aa9c50
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 17 deletions.
diff --git a/sorc/CMakeLists.txt b/sorc/CMakeLists.txt
@@ -14,6 +14,7 @@ add_subdirectory(nemsio_chgdate.fd)
 add_subdirectory(mkgfsnemsioctl.fd)
 add_subdirectory(fre-nctools.fd)
 add_subdirectory(chgres_cube.fd)
-add_subdirectory(orog.fd)
-add_subdirectory(orog.fd/lake.fd)
+add_subdirectory(orog_mask_tools.fd/orog.fd)
+add_subdirectory(orog_mask_tools.fd/lake.fd)
+add_subdirectory(orog_mask_tools.fd/inland.fd)
 add_subdirectory(sfc_climo_gen.fd)
diff --git a/sorc/orog_mask_tools.fd/inland.fd/CMakeLists.txt b/sorc/orog_mask_tools.fd/inland.fd/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(fortran_src
+    nb.F90  
+    inland.F90)
+
+if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -assume byterecl")
+elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-range-check")
+endif()
+
+set(exe_name inland)
+
+add_executable(${exe_name} ${fortran_src})
+
+target_link_libraries(
+  ${exe_name}
+  NetCDF::NetCDF_Fortran)
+
+install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir})
diff --git a/sorc/orog.fd/lake.fd/inland.F90 → sorc/orog_mask_tools.fd/inland.fd/inland.F90 b/sorc/orog.fd/lake.fd/inland.F90 → sorc/orog_mask_tools.fd/inland.fd/inland.F90
diff --git a/sorc/orog.fd/lake.fd/nb.F90 → sorc/orog_mask_tools.fd/inland.fd/nb.F90 b/sorc/orog.fd/lake.fd/nb.F90 → sorc/orog_mask_tools.fd/inland.fd/nb.F90
diff --git a/sorc/orog.fd/lake.fd/CMakeLists.txt → ...orog_mask_tools.fd/lake.fd/CMakeLists.txt b/sorc/orog.fd/lake.fd/CMakeLists.txt → ...orog_mask_tools.fd/lake.fd/CMakeLists.txt
@@ -1,30 +1,20 @@
-set(fortran_src1
+set(fortran_src
     enclosure_cnvx.F90  
     find_limit.F90  
     lakefrac.F90)
 
-set(fortran_src2
-    nb.F90  
-    inland.F90)
-
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -assume byterecl")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-range-check")
 endif()
 
-set(exe_name1 lakefrac)
-set(exe_name2 inland)
-
-add_executable(${exe_name1} ${fortran_src1})
-add_executable(${exe_name2} ${fortran_src2})
+set(exe_name lakefrac)
 
-target_link_libraries(
-  ${exe_name1}
-  NetCDF::NetCDF_Fortran)
+add_executable(${exe_name} ${fortran_src})
 
 target_link_libraries(
-  ${exe_name2}
+  ${exe_name}
   NetCDF::NetCDF_Fortran)
 
-install(TARGETS ${exe_name1} ${exe_name2} RUNTIME DESTINATION ${exec_dir})
+install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir})
diff --git a/sorc/orog.fd/lake.fd/enclosure_cnvx.F90 → ..._mask_tools.fd/lake.fd/enclosure_cnvx.F90 b/sorc/orog.fd/lake.fd/enclosure_cnvx.F90 → ..._mask_tools.fd/lake.fd/enclosure_cnvx.F90
diff --git a/sorc/orog.fd/lake.fd/find_limit.F90 → ...orog_mask_tools.fd/lake.fd/find_limit.F90 b/sorc/orog.fd/lake.fd/find_limit.F90 → ...orog_mask_tools.fd/lake.fd/find_limit.F90
diff --git a/sorc/orog.fd/lake.fd/lakefrac.F90 → sorc/orog_mask_tools.fd/lake.fd/lakefrac.F90 b/sorc/orog.fd/lake.fd/lakefrac.F90 → sorc/orog_mask_tools.fd/lake.fd/lakefrac.F90
diff --git a/sorc/orog.fd/.gitignore → sorc/orog_mask_tools.fd/orog.fd/.gitignore b/sorc/orog.fd/.gitignore → sorc/orog_mask_tools.fd/orog.fd/.gitignore
diff --git a/sorc/orog.fd/CMakeLists.txt → ...orog_mask_tools.fd/orog.fd/CMakeLists.txt b/sorc/orog.fd/CMakeLists.txt → ...orog_mask_tools.fd/orog.fd/CMakeLists.txt
diff --git a/sorc/orog.fd/README → sorc/orog_mask_tools.fd/orog.fd/README b/sorc/orog.fd/README → sorc/orog_mask_tools.fd/orog.fd/README
diff --git a/sorc/orog.fd/README_OC → sorc/orog_mask_tools.fd/orog.fd/README_OC b/sorc/orog.fd/README_OC → sorc/orog_mask_tools.fd/orog.fd/README_OC
diff --git a/sorc/orog.fd/machine.h → sorc/orog_mask_tools.fd/orog.fd/machine.h b/sorc/orog.fd/machine.h → sorc/orog_mask_tools.fd/orog.fd/machine.h
diff --git a/sorc/orog.fd/mtnlm7_oclsm.f → ...orog_mask_tools.fd/orog.fd/mtnlm7_oclsm.f b/sorc/orog.fd/mtnlm7_oclsm.f → ...orog_mask_tools.fd/orog.fd/mtnlm7_oclsm.f
diff --git a/sorc/orog.fd/netcdf_io.F90 → .../orog_mask_tools.fd/orog.fd/netcdf_io.F90 b/sorc/orog.fd/netcdf_io.F90 → .../orog_mask_tools.fd/orog.fd/netcdf_io.F90
diff --git a/sorc/orog.fd/resevod.h → sorc/orog_mask_tools.fd/orog.fd/resevod.h b/sorc/orog.fd/resevod.h → sorc/orog_mask_tools.fd/orog.fd/resevod.h