From 33baad59afee5ad61589ba4adf51996794b999d9 Mon Sep 17 00:00:00 2001 From: suvarchal Date: Fri, 12 Sep 2025 02:04:08 +0200 Subject: [PATCH 1/4] Fix: add consistent intent in for partit for integrate_2D --- src/gen_forcing_couple.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gen_forcing_couple.F90 b/src/gen_forcing_couple.F90 index 67ba51c43..2aed84b52 100755 --- a/src/gen_forcing_couple.F90 +++ b/src/gen_forcing_couple.F90 @@ -34,7 +34,7 @@ subroutine integrate_2D(flux_global, flux_local, eff_vol, field2d, mask, partit, USE MOD_PARTIT USE MOD_PARSUP type(t_mesh), intent(in), target :: mesh - type(t_partit), intent(inout), target :: partit + type(t_partit), intent(in), target :: partit real(kind=WP), intent (out) :: flux_global(2), flux_local(2) real(kind=WP), intent (out) :: eff_vol(2) real(kind=WP), intent (in) :: field2d(partit%myDim_nod2D+partit%eDim_nod2D) From 8179ebbf96048fcf992ef222d2e354680a979db5 Mon Sep 17 00:00:00 2001 From: suvarchal Date: Fri, 12 Sep 2025 02:12:15 +0200 Subject: [PATCH 2/4] Fix: remove needess save attribute for modules with save --- src/cpl_driver.F90 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cpl_driver.F90 b/src/cpl_driver.F90 index a26b842f2..d5ab69c69 100644 --- a/src/cpl_driver.F90 +++ b/src/cpl_driver.F90 @@ -60,11 +60,11 @@ module cpl_driver integer :: commRank integer :: comp_id ! id returned by oasis_init_comp - logical, save :: oasis_was_initialized - logical, save :: oasis_was_terminated - integer, save :: write_grid + logical :: oasis_was_initialized + logical :: oasis_was_terminated + integer :: write_grid - integer, save :: seconds_til_now=0 + integer :: seconds_til_now=0 integer :: ierror ! return error code logical :: rootexchg =.true. ! logical switch @@ -893,7 +893,7 @@ subroutine cpl_oasis3mct_recv(ind, data_array, action, partit) ! integer :: info integer :: j - integer, save :: ncount = 0 + integer :: ncount = 0 real (kind=WP) :: t1, t2, t3 ! !-------------------------------------------------------------------- From be8f754005f6e8d43c87c7321e86b0459c3a9ec4 Mon Sep 17 00:00:00 2001 From: suvarchal Date: Fri, 12 Sep 2025 02:21:16 +0200 Subject: [PATCH 3/4] Fix: remove needless trailing comments for preprocessor ! oifs --- src/gen_forcing_couple.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gen_forcing_couple.F90 b/src/gen_forcing_couple.F90 index 2aed84b52..3e7e85d4a 100755 --- a/src/gen_forcing_couple.F90 +++ b/src/gen_forcing_couple.F90 @@ -211,7 +211,7 @@ subroutine update_atm_forcing(istep, ice, tracers, dynamics, partit, mesh) end do else print *, 'not installed yet or error in cpl_oasis3mct_send', mype -#else ! oifs +#else ! AWI-CM2 outgoing state vectors do n=1,myDim_nod2D+eDim_nod2D exchange(n)=tracers%data(1)%values(1, n) ! sea surface temperature [°C] @@ -267,7 +267,7 @@ subroutine update_atm_forcing(istep, ice, tracers, dynamics, partit, mesh) !---wiso-code-end else print *, 'not installed yet or error in cpl_oasis3mct_send', mype -#endif ! oifs +#endif endif call cpl_oasis3mct_send(i, exchange, action, partit) end do @@ -384,7 +384,7 @@ subroutine update_atm_forcing(istep, ice, tracers, dynamics, partit, mesh) if (action) then v_wind(:) = exchange(:) ! meridional wind end if -#else ! oifs +#else elseif (i.eq.13) then if (action) then if (lwiso) then @@ -474,7 +474,7 @@ subroutine update_atm_forcing(istep, ice, tracers, dynamics, partit, mesh) if (use_icebergs.and.lwiso) then call force_flux_consv(v_wind, mask, i, 0, action, partit, mesh) end if -#endif ! oifs +#endif end if #ifdef VERBOSE From 92936b4d11063257ceb00aad34bc472ee66cba81 Mon Sep 17 00:00:00 2001 From: suvarchal Date: Fri, 12 Sep 2025 02:29:56 +0200 Subject: [PATCH 4/4] Fix: remove needless nested preprocessor assign for iceberg in associate_mesh_ass.h as the variable is used in fesom module regardless f%mesh%Z_3d_n_ib = f%mesh%Z_3d_n and in icb_dyn.F90 --- src/associate_mesh_ass.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/associate_mesh_ass.h b/src/associate_mesh_ass.h index 036baa2d4..2e6366874 100644 --- a/src/associate_mesh_ass.h +++ b/src/associate_mesh_ass.h @@ -64,9 +64,7 @@ hnode(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D) => mesh%hnode(:,:) hnode_new(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D) => mesh%hnode_new(:,:) zbar_3d_n(1:mesh%nl, 1:myDim_nod2D+eDim_nod2D) => mesh%zbar_3d_n(:,:) Z_3d_n(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D) => mesh%Z_3d_n(:,:) -#if defined(__async_icebergs) Z_3d_n_ib(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D) => mesh%Z_3d_n_ib(:,:) -#endif helem(1:mesh%nl-1, 1:myDim_elem2D+eDim_elem2D) => mesh%helem(:,:) bottom_elem_thickness(1:myDim_elem2D+eDim_elem2D) => mesh%bottom_elem_thickness(:) bottom_node_thickness(1:myDim_nod2D+eDim_nod2D) => mesh%bottom_node_thickness(:)