FESOM · suvarchal · Jul 5, 2025 · Jul 5, 2025 · Jul 5, 2025 · Jul 5, 2025
diff --git a/mesh_part/CMakeLists.txt b/mesh_part/CMakeLists.txt
@@ -46,6 +46,7 @@ set(sources_Fortran
     ${src_home}/gen_modules_config.F90 
     ${src_home}/gen_modules_partitioning.F90 
     ${src_home}/gen_modules_rotate_grid.F90 
+    ${src_home}/mod_mesh_utils.F90
     ${src_home}/fvom_init.F90 
     ${src_home}/oce_local.F90 
     ${src_home}/gen_comm.F90 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -177,7 +177,7 @@ add_custom_target(fesom_version_info-generated.F90 ALL
 #if(FESOM_STANDALONE)
 #   list(REMOVE_ITEM sources_Fortran ${src_home}/cpl_driver.F90)
 #endif()
-list(REMOVE_ITEM sources_Fortran ${src_home}/fvom_init.F90 ${src_home}/oce_local.F90 ${src_home}/gen_comm.F90)
+list(REMOVE_ITEM sources_Fortran ${src_home}/fvom_init.F90 ${src_home}/mod_mesh_utils.F90 ${src_home}/oce_local.F90 ${src_home}/gen_comm.F90)
 list(REMOVE_ITEM sources_Fortran ${src_home}/fesom_main.F90)
 
 find_package( NETCDF REQUIRED COMPONENTS C Fortran )

diff --git a/src/MOD_MESH.F90 b/src/MOD_MESH.F90
@@ -1,6 +1,6 @@
 !==========================================================
 MODULE MOD_MESH
-USE O_PARAM
+USE O_PARAM, only : WP
 USE MOD_WRITE_BINARY_ARRAYS
 USE MOD_READ_BINARY_ARRAYS
 USE,     intrinsic    :: ISO_FORTRAN_ENV, only : int32

diff --git a/src/MOD_PARTIT.F90 b/src/MOD_PARTIT.F90
@@ -1,7 +1,6 @@
 !==========================================================
 ! Variables to organize parallel work
 module MOD_PARTIT
-USE O_PARAM
 USE, intrinsic :: ISO_FORTRAN_ENV, only : int32
 USE MOD_WRITE_BINARY_ARRAYS
 USE MOD_READ_BINARY_ARRAYS

diff --git a/src/cpl_driver.F90 b/src/cpl_driver.F90
@@ -14,8 +14,9 @@ module cpl_driver
   !
   use mod_oasis                    ! oasis module
   use g_config, only : dt, use_icebergs, lwiso, compute_oasis_corners
-  use o_param,  only : rad
+  use o_param,  only : rad, WP
   USE MOD_PARTIT
+  use oce_mesh_module, only : elem_center, edge_center
   use mpi
   implicit none
   save   
@@ -393,7 +394,7 @@ subroutine cpl_oasis3mct_define_unstr(partit, mesh)
     use mod_oasis, only: oasis_write_area, oasis_write_mask
     implicit none
     save
-    type(t_mesh),   intent(in),    target :: mesh
+    type(t_mesh),   intent(in), target :: mesh
     type(t_partit), intent(inout), target :: partit
     !-------------------------------------------------------------------
     ! Definition of grid and field information for ocean

diff --git a/src/fesom_meshdiag.F90 b/src/fesom_meshdiag.F90
@@ -19,6 +19,8 @@ program fesom_meshdiag
   use g_config
   use g_comm_auto
   use io_mesh_info
+  use oce_setup_step_module, only: tracer_init, ocean_setup, dynamics_init, arrays_init
+  use oce_mesh_module, only: mesh_setup, check_mesh_consistency
   use, intrinsic :: iso_fortran_env, only : real32
 
   implicit none

diff --git a/src/fesom_module.F90 b/src/fesom_module.F90
@@ -19,15 +19,15 @@ module fesom_main_storage_module
   use io_mesh_info
   use diagnostics
   use mo_tidal
-  use tracer_init_interface
-  use ocean_setup_interface
+  use oce_setup_step_module, only: tracer_init, ocean_setup, dynamics_init, arrays_init
   use ice_setup_interface
   use ocean2ice_interface
   use oce_fluxes_interface
-  use update_atm_forcing_interface
-  use before_oce_step_interface
-  use oce_timestep_ale_interface
-  use read_mesh_interface
+  use forcing_coupling_interfaces, only: update_atm_forcing
+  use oce_setup_step_module, only: before_oce_step
+  use oce_ale_module, only: oce_timestep_ale, restart_thickness_ale
+  use oce_mesh_module, only: mesh_setup, check_mesh_consistency
+  use oce_dyn_module, only: compute_vel_nodes
   use fesom_version_info_module
   use command_line_options_module
   use, intrinsic :: iso_fortran_env, only : real32