Skip to content

Commit 7846a0d

Browse files
committed
remove needless modules-interfaces for oce_adv_tra_driver.F90 and update references
1 parent 8cb2786 commit 7846a0d

3 files changed

Lines changed: 18 additions & 35 deletions

File tree

src/oce_adv_tra_driver.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module oce_adv_tra_driver_module
88
use diagnostics
99
use oce_adv_tra_hor_interfaces
1010
use oce_adv_tra_ver_interfaces
11-
use oce_adv_tra_fct_interfaces
11+
use oce_adv_tra_fct_module, only: oce_tra_adv_fct
1212

1313
implicit none
1414

@@ -30,7 +30,7 @@ subroutine do_oce_adv_tra(dt, vel, w, wi, we, tr_num, dynamics, tracers, partit,
3030
use diagnostics, only: ldiag_DVD
3131
use oce_adv_tra_hor_interfaces
3232
use oce_adv_tra_ver_interfaces
33-
use oce_adv_tra_fct_interfaces
33+
use oce_adv_tra_fct_module, only: oce_tra_adv_fct
3434
! oce_tra_adv_flux2dtracer is now in the same module
3535
implicit none
3636
real(kind=WP), intent(in), target :: dt

src/oce_adv_tra_fct.F90

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,17 @@
1-
module oce_adv_tra_fct_interfaces
2-
interface
3-
subroutine oce_adv_tra_fct_init(twork, partit, mesh)
4-
use MOD_MESH
5-
use MOD_TRACER
6-
USE MOD_PARTIT
7-
USE MOD_PARSUP
8-
type(t_mesh), intent(in), target :: mesh
9-
type(t_partit),intent(inout), target :: partit
10-
type(t_tracer_work), intent(inout), target :: twork
11-
end subroutine oce_adv_tra_fct_init
1+
module oce_adv_tra_fct_module
2+
use MOD_MESH
3+
use MOD_TRACER
4+
USE MOD_PARTIT
5+
USE MOD_PARSUP
6+
USE g_comm_auto
7+
8+
implicit none
9+
10+
private
11+
public :: oce_adv_tra_fct_init, oce_tra_adv_fct
12+
13+
contains
1214

13-
subroutine oce_tra_adv_fct(dt, ttf, lo, adf_h, adf_v, fct_ttf_min, fct_ttf_max, fct_plus, fct_minus, AUX, partit, mesh)
14-
use MOD_MESH
15-
USE MOD_PARTIT
16-
USE MOD_PARSUP
17-
real(kind=WP), intent(in), target :: dt
18-
type(t_partit),intent(inout), target :: partit
19-
type(t_mesh), intent(in), target :: mesh
20-
real(kind=WP), intent(inout) :: fct_ttf_min(mesh%nl-1, partit%myDim_nod2D+partit%eDim_nod2D)
21-
real(kind=WP), intent(inout) :: fct_ttf_max(mesh%nl-1, partit%myDim_nod2D+partit%eDim_nod2D)
22-
real(kind=WP), intent(in) :: ttf(mesh%nl-1, partit%myDim_nod2D+partit%eDim_nod2D)
23-
real(kind=WP), intent(in) :: lo (mesh%nl-1, partit%myDim_nod2D+partit%eDim_nod2D)
24-
real(kind=WP), intent(inout) :: adf_h(mesh%nl-1, partit%myDim_edge2D)
25-
real(kind=WP), intent(inout) :: adf_v(mesh%nl, partit%myDim_nod2D)
26-
real(kind=WP), intent(inout) :: fct_plus(mesh%nl-1, partit%myDim_nod2D)
27-
real(kind=WP), intent(inout) :: fct_minus(mesh%nl, partit%myDim_nod2D)
28-
real(kind=WP), intent(inout) :: AUX(:,:,:) !a large auxuary array
29-
end subroutine oce_tra_adv_fct
30-
end interface
31-
end module oce_adv_tra_fct_interfaces
32-
!
33-
!
3415
!===============================================================================
3516
subroutine oce_adv_tra_fct_init(twork, partit, mesh)
3617
use MOD_MESH
@@ -498,3 +479,5 @@ subroutine oce_tra_adv_fct(dt, ttf, lo, adf_h, adf_v, fct_ttf_min, fct_ttf_max,
498479
!$ACC END DATA
499480
#endif
500481
end subroutine oce_tra_adv_fct
482+
483+
end module oce_adv_tra_fct_module

src/oce_setup_step.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module oce_setup_step_module
1717
use Toy_Channel_Soufflet
1818
use Toy_Channel_Dbgyre
1919
use oce_ale_module, only: init_ale, init_thickness_ale, init_stiff_mat_ale
20-
use oce_adv_tra_fct_interfaces
20+
use oce_adv_tra_fct_module, only: oce_adv_tra_fct_init
2121
use oce_muscl_adv_module, only: muscl_adv_init
2222
use oce_ale_pressure_bv_module, only: init_ref_density
2323

0 commit comments

Comments
 (0)