Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up orography code #987

Merged
merged 57 commits into from
Sep 30, 2024
Merged

Clean up orography code #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
a4b7d50
Remove spectral filtering of topography.
GeorgeGayno-NOAA Jun 27, 2024
09928c7
Cleanup related to the removal of the spectral terrain
GeorgeGayno-NOAA Jun 27, 2024
a350cb0
Remove filtered orography array, which is no longer needed.
GeorgeGayno-NOAA Jun 28, 2024
a052eef
Remove computation of latitude for obsolete gaussian grids.
GeorgeGayno-NOAA Jun 28, 2024
14c0faf
More clean up.
GeorgeGayno-NOAA Jun 28, 2024
c848aeb
Remove some logic associated with obsolete routine makeoa3.
GeorgeGayno-NOAA Jun 28, 2024
65c9ece
Remove obsolete routine MAKEOA3 and some functions.
GeorgeGayno-NOAA Jun 28, 2024
40b3114
Remove obsolete routine makeoa.
GeorgeGayno-NOAA Jun 28, 2024
54a0a3e
Remove dependency on IPLIB.
GeorgeGayno-NOAA Jun 28, 2024
320b8f8
Remove obsolete routine MAKEPC.
GeorgeGayno-NOAA Jul 8, 2024
b29d87c
Remove unused routine minmaxj.
GeorgeGayno-NOAA Jul 9, 2024
5e5503c
Remove unused function 'spherical_distance'.
GeorgeGayno-NOAA Jul 9, 2024
168c0b3
Add formal 'end' statements for all subroutines and functions.
GeorgeGayno-NOAA Jul 9, 2024
549d2b6
Remove obsolete routine makemt and related logic.
GeorgeGayno-NOAA Jul 10, 2024
15bbc85
Remove read of gaussian ocean mask file, which is not
GeorgeGayno-NOAA Jul 10, 2024
b88a58e
Merge branch 'develop' into cleanup/orog3
GeorgeGayno-NOAA Jul 16, 2024
6b4568e
Move read of model 'grid' file in the driver to its own
GeorgeGayno-NOAA Jul 16, 2024
2725c69
Remove obsolete calls to sp library routines.
GeorgeGayno-NOAA Jul 16, 2024
fae9d8c
Place logic that find i/j indices of the n/s poles in its
GeorgeGayno-NOAA Jul 22, 2024
b149255
Move logic that finds the model points which surround the pole
GeorgeGayno-NOAA Jul 22, 2024
c4f10c2
Remove some unneeded diagnostic print.
GeorgeGayno-NOAA Jul 23, 2024
b62cc65
Move transpose of orography data to its own routine. Remove
GeorgeGayno-NOAA Jul 23, 2024
428f6d6
Place read of global mask data and its transpose in
GeorgeGayno-NOAA Jul 23, 2024
67a7df2
Remove unused variable GLAT from routine TERSUB. Remove some
GeorgeGayno-NOAA Jul 23, 2024
030203f
Move read of RAMP data and the QC of the global data to
GeorgeGayno-NOAA Jul 23, 2024
dd3dcc4
Move read of model grid file to its own routine.
GeorgeGayno-NOAA Jul 24, 2024
d78a42d
Update argument list for inside_a_polygon to eliminate warnings
GeorgeGayno-NOAA Jul 24, 2024
1b9707b
General clean up.
GeorgeGayno-NOAA Jul 24, 2024
a4d0b30
Move logic that removes isolated model points to its
Jul 25, 2024
0836573
Clean up print statements and general clean up.
Jul 25, 2024
e2681c1
Standardize print statements.
Jul 26, 2024
b3da945
Move routine latlon2xyz to a new module that will host
Jul 29, 2024
5d93187
Update prolog. Change name of 'merge_file' to a more descriptive
Jul 31, 2024
be2a680
Combine routine minmxj and mnmxja into a single routine called
Jul 31, 2024
fde1c2e
Move function get_lat_angle to the orog_utils module and
Aug 1, 2024
79426f4
Move function get_lon_angle to the orog_utils module. Add logic
Aug 1, 2024
0045fcb
Merge branch 'develop' into cleanup/orog3
Aug 27, 2024
6d317e9
Merge branch 'develop' into cleanup/orog3
Sep 16, 2024
f94d149
Move routines 'timef', 'transpose_mask' and 'spherical_angle'
Sep 16, 2024
e51a6dc
Move 'transpose_orog' and 'inside_a_polygon' to new
Sep 16, 2024
ddc2d1c
Move 'find_poles' and 'find_nearest_pole_points' to
Sep 16, 2024
ddf02d9
Make routine 'latlon2xyz' public so it may be used by the
Sep 17, 2024
653e704
Move routine 'remove_isolated_pts' to the orog_utils module.
Sep 17, 2024
0171cc0
Move routines 'read_global_mask', 'read_global_orog' and
Sep 17, 2024
753a8d7
Move routine 'get_index' to module orog_utils.
Sep 17, 2024
5e0b350
Move function get_xnsum to orog_utils module.
Sep 17, 2024
856a3c7
Move 'get_xnsum2' and 'get_xnsum3' to orog_utils module.
Sep 17, 2024
d477f17
Rename netcdf_io.F90 to a more descriptive io_utils.F90.
Sep 17, 2024
a4b1434
Update the doxygen.
GeorgeGayno-NOAA Sep 18, 2024
71b0779
Convert io_utils.F90 into a Fortran module.
Sep 18, 2024
e54edb9
Fix intent attribute hc in routine get_xnsum3.
Sep 18, 2024
a0eb44c
Remove space from variable XMSUM_ALL.
Sep 18, 2024
9b698ea
Update driver routine to be Fortran 90.
Sep 18, 2024
39db5c5
Add intent attributes to all routines in mtnlm7_oclsm.F90.
Sep 18, 2024
f8a5626
Remove some unused variables.
Sep 19, 2024
2e84186
Remove unused logic.
Sep 19, 2024
2de84bc
Remove a debugging compiler flag.
GeorgeGayno-NOAA Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(lib_src netcdf_io.F90)
set(exe_src mtnlm7_oclsm.F)
set(lib_src io_utils.F90 orog_utils.F90)
set(exe_src mtnlm7_oclsm.F90)

if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -convert big_endian -assume byterecl")
Expand All @@ -9,14 +9,11 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-invalid-boz")
endif()
endif()
if(ip_VERSION GREATER_EQUAL 4.0.0)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DIP_V4")
endif()

set(exe_name orog)

add_library(orog_lib STATIC ${lib_src})
add_executable(${exe_name} mtnlm7_oclsm.F)
add_executable(${exe_name} mtnlm7_oclsm.F90)

set(mod_dir "${CMAKE_CURRENT_BINARY_DIR}/mod")
set_target_properties(orog_lib PROPERTIES Fortran_MODULE_DIRECTORY ${mod_dir})
Expand All @@ -27,13 +24,8 @@ target_link_libraries(
PUBLIC
bacio::bacio_4
w3emc::w3emc_d
ip::ip_d
NetCDF::NetCDF_Fortran)

if(sp_FOUND)
target_link_libraries(orog_lib PUBLIC sp::sp_d)
endif()

if(OpenMP_Fortran_FOUND)
target_link_libraries(orog_lib PUBLIC OpenMP::OpenMP_Fortran)
endif()
Expand Down
Loading
Loading