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.

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

Adds ifdef use_drifters in all drifter modules #1329

Merged
merged 4 commits into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions drifters/cloud_interpolator.F90
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
!> @addtogroup cloud_interpolator_mod
!> @{
MODULE cloud_interpolator_mod
#ifdef use_drifters
implicit none
private

Expand Down Expand Up @@ -284,6 +285,7 @@ pure subroutine cld_ntrp_get_cell_values(nsizes, fnodes, indices, fvals, ier)

end subroutine cld_ntrp_get_cell_values

#endif
end MODULE cloud_interpolator_mod
!===============================================================================
!> @}
Expand Down
3 changes: 2 additions & 1 deletion drifters/drifters.F90
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
!> @addtogroup drifters_mod
!> @{
module drifters_mod
#ifdef use_drifters

#ifdef _SERIAL

Expand Down Expand Up @@ -947,7 +948,7 @@ subroutine drifters_reset_rk4(self, ermesg)
endif

end subroutine drifters_reset_rk4

#endif
end module drifters_mod
!> @}
! close documentation grouping
3 changes: 2 additions & 1 deletion drifters/drifters_comm.F90
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
!> @brief Routines and types to update drifter positions across processor domains

module drifters_comm_mod
#ifdef use_drifters

#ifdef _SERIAL

Expand Down Expand Up @@ -769,7 +770,7 @@ subroutine drifters_comm_gather(self, drfts, dinp, &

end subroutine drifters_comm_gather


#endif
end module drifters_comm_mod

!===============================================================================
Expand Down
3 changes: 2 additions & 1 deletion drifters/drifters_core.F90
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
!> @brief Handles the mechanics for adding and removing drifters

module drifters_core_mod
#ifdef use_drifters
use platform_mod
implicit none
private
Expand Down Expand Up @@ -272,7 +273,7 @@ subroutine drifters_core_print(self1, ermesg1)

end subroutine drifters_core_print


#endif
end module drifters_core_mod
!###############################################################################
!> @}
Expand Down
3 changes: 2 additions & 1 deletion drifters/drifters_input.F90
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
!> @addtogroup drifters_input_mod
!> @{
module drifters_input_mod
#ifdef use_drifters
implicit none
private

Expand Down Expand Up @@ -444,7 +445,7 @@ subroutine drifters_input_save(self, filename, geolon, geolat, ermesg)
& //nf_strerror(ier)

end subroutine drifters_input_save

#endif
end module drifters_input_mod
!> @}
! close documentation grouping
3 changes: 2 additions & 1 deletion drifters/drifters_io.F90
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
!> @addtogroup drifters_io_mod
!> @{
module drifters_io_mod
#ifdef use_drifters

use netcdf
use netcdf_nf_data
Expand Down Expand Up @@ -307,7 +308,7 @@ subroutine drifters_io_write(self, time, np, nd, nf, ids, positions, fields, erm
self%it_id = self%it_id + np

end subroutine drifters_io_write

#endif
end module drifters_io_mod
!> @}
! close documentation grouping
2 changes: 2 additions & 0 deletions test_fms/drifters/test_cloud_interpolator.F90
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
!***********************************************************************

program test_cloud_interpolator
#ifdef use_drifters
use cloud_interpolator_mod
use mpp_mod, only : mpp_error, FATAL, stdout, mpp_init, mpp_exit

Expand Down Expand Up @@ -215,4 +216,5 @@ subroutine test_get_node_values

end subroutine test_get_node_values

#endif
end program test_cloud_interpolator
3 changes: 2 additions & 1 deletion test_fms/drifters/test_drifters.F90
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
!***********************************************************************

program test_drifters
#ifdef use_drifters

!* contents of input file: drifters_inp_test_3d.nc
!!$netcdf drifters_inp_test_3d {
Expand Down Expand Up @@ -336,7 +337,7 @@ program test_drifters
!#ifndef _SERIAL
call mpp_exit
!#endif

#endif
end program test_drifters

subroutine my_error_handler(mesg)
Expand Down
2 changes: 2 additions & 0 deletions test_fms/drifters/test_drifters_comm.F90
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
!**********************************************************************

program test_drifters_comm
#ifdef use_drifters

use drifters_core_mod
use drifters_comm_mod
Expand Down Expand Up @@ -143,4 +144,5 @@ program test_drifters_comm
call mpp_domains_exit
call mpp_exit

#endif
end program test_drifters_comm
2 changes: 2 additions & 0 deletions test_fms/drifters/test_drifters_core.F90
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
!**********************************************************************

program test_drifters_core
#ifdef use_drifters

use drifters_core_mod
use fms_mod, only : fms_init, fms_end
Expand Down Expand Up @@ -111,4 +112,5 @@ program test_drifters_core
!!$ print *,'Sucessful test ier=', ier
!!$ end if
call fms_end()
#endif
end program test_drifters_core
2 changes: 2 additions & 0 deletions test_fms/drifters/test_drifters_input.F90
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
!***********************************************************************

program test_drifters_input
#ifdef use_drifters
use drifters_input_mod
use fms_mod, only : fms_init, fms_end
use mpp_mod, only : mpp_error, FATAL, stdout
Expand Down Expand Up @@ -54,4 +55,5 @@ program test_drifters_input
call drifters_input_del(obj, ermesg)

call fms_end()
#endif
end program test_drifters_input
2 changes: 2 additions & 0 deletions test_fms/drifters/test_drifters_io.F90
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
!***********************************************************************

program test_drifters_io
#ifdef use_drifters

use drifters_io_mod
use mpp_mod, only : mpp_error, FATAL, stdout, mpp_init, mpp_exit
Expand Down Expand Up @@ -156,4 +157,5 @@ program test_drifters_io
call mpp_error(FATAL, ermesg)
endif
call mpp_exit()
#endif
end program test_drifters_io
2 changes: 2 additions & 0 deletions test_fms/drifters/test_quicksort.F90
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
!***********************************************************************

program test_quicksort
#ifdef use_drifters
implicit none
integer :: list(16) = (/6, 2, 3, 4, 1, 45, 3432, 3245, 32545, 66555, 32, 1,3, -43254, 324, 54/)
print *,'before list=', list
call qksrt_quicksort(size(list), list, 1, size(list))
print *,'after list=', list
#endif
end program test_quicksort
Loading