Merge branch 'Merge2Main' into 'main'

hotfix

See merge request inmcm60_pbl/inmcm60_sfx!16

srcC/sfx_call_cxx.c

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include "../includeCXX/sfx_call_class_func.h"
 // -------------------------------------------------------------------------- //
-void surf_flux (float *zeta_, float *Rib_, float *Re_, float *B_, float *z0_m_, float *z0_t_, float *Rib_conv_lim_, float *Cm_, float *Ct_, float *Km_, float *Pr_t_inv_,
+void get_surface_fluxes (float *zeta_, float *Rib_, float *Re_, float *B_, float *z0_m_, float *z0_t_, float *Rib_conv_lim_, float *Cm_, float *Ct_, float *Km_, float *Pr_t_inv_,
     float *U_, float *dT_, float *Tsemi_, float *dQ_, float *h_, float *in_z0_m_,
     const float *kappa, const float *Pr_t_0_inv, const float *Pr_t_inf_inv, 
     const float *alpha_m, const float *alpha_h, const float *alpha_h_fix, 

srcF/sfx_esm.f90

@@ -55,7 +55,7 @@ contains
         integer i
         ! ----------------------------------------------------------------------------
 #if defined(INCLUDE_CUDA) || defined(INCLUDE_CXX)
-        call surf_flux(sfx%zeta, sfx%Rib, sfx%Re, sfx%B, sfx%z0_m, sfx%z0_t, &
+        call get_surface_fluxes(sfx%zeta, sfx%Rib, sfx%Re, sfx%B, sfx%z0_m, sfx%z0_t, &
         sfx%Rib_conv_lim, sfx%Cm, sfx%Ct, sfx%Km, sfx%Pr_t_inv, &
         meteo%U, meteo%dT, meteo%Tsemi, meteo%dQ, meteo%h, meteo%z0_m, &
         kappa, Pr_t_0_inv, Pr_t_inf_inv, & 
@@ -86,6 +86,7 @@ contains
     end subroutine get_surface_fluxes_vec
     ! --------------------------------------------------------------------------------
 
+#if !defined(INCLUDE_CUDA) && !defined(INCLUDE_CXX)
     ! --------------------------------------------------------------------------------
     subroutine get_surface_fluxes(sfx, meteo, numerics)
         !< @brief surface flux calculation for single cell
@@ -260,7 +261,7 @@ contains
 
     end subroutine get_surface_fluxes
     ! --------------------------------------------------------------------------------
-
+#endif
     ! convection universal functions shortcuts
     ! --------------------------------------------------------------------------------
     function f_m_conv(zeta)

srcF/sfx_fc_wrapper.F90

 module C_FUNC
     INTERFACE
 #if defined(INCLUDE_CUDA) || defined(INCLUDE_CXX)
-        SUBROUTINE surf_flux(zeta, Rib, Re, B, z0_m, z0_t, Rib_conv_lim, &
+        SUBROUTINE get_surface_fluxes(zeta, Rib, Re, B, z0_m, z0_t, Rib_conv_lim, &
             Cm, Ct, Km, Prt_inv, & 
             U, dT, Tsemi, dQ, h, in_z0_m, & 
             kappa, Pr_t_0_inv, Pr_t_inf_inv, & 
@@ -22,7 +22,7 @@ module C_FUNC
             B_max_lake, gamma_c, Re_visc_min, Pr_m, nu_air, g
             REAL(C_FLOAT), dimension(grid_size) :: U, dT, Tsemi, dQ, h, in_z0_m, zeta, Rib, Re, &
             Rib_conv_lim, z0_m, z0_t, B, Cm, Ct, Km, Prt_inv
-        END SUBROUTINE surf_flux
+        END SUBROUTINE get_surface_fluxes
 #endif
     END INTERFACE
 end module C_FUNC