diff --git a/includeCXX/sfx_model_compute_flux_cxx.h b/includeCXX/sfx_model_compute_flux_cxx.h
index 76f4039609c51ff6c49816d49bf6ea1d0d8c358e..880539659202278b515f55da64f6af6f16ade964 100644
--- a/includeCXX/sfx_model_compute_flux_cxx.h
+++ b/includeCXX/sfx_model_compute_flux_cxx.h
@@ -5,7 +5,7 @@
extern "C" {
#endif
- void esm_compute_flux_cxx(struct sfxDataVecTypeC* sfx,
+ void cxx_esm_compute_flux(struct sfxDataVecTypeC* sfx,
struct meteoDataVecTypeC* meteo,
const struct sfx_esm_param_C* model_param,
const struct sfx_surface_param* surface_param,
@@ -13,7 +13,7 @@ extern "C" {
const struct sfx_phys_constants* constants,
const int grid_size);
- void sheba_compute_flux_cxx(struct sfxDataVecTypeC* sfx,
+ void cxx_sheba_compute_flux(struct sfxDataVecTypeC* sfx,
struct meteoDataVecTypeC* meteo,
const struct sfx_sheba_param_C* model_param,
const struct sfx_surface_param* surface_param,
diff --git a/srcC/sfx_model_compute_flux_c.c b/srcC/sfx_model_compute_flux_c.c
index b315e3cc8dd8a94abc30a76cc296dc65ad3482f8..b9cbf6a71b9aee4be12ebf9a8cf80bfcdac0d142 100644
--- a/srcC/sfx_model_compute_flux_c.c
+++ b/srcC/sfx_model_compute_flux_c.c
@@ -4,7 +4,7 @@
// #include "../includeC/sfx_call_cxx.h"
// -------------------------------------------------------------------------- //
-void esm_compute_flux_c (struct sfxDataVecTypeC* sfx,
+void c_esm_compute_flux (struct sfxDataVecTypeC* sfx,
struct meteoDataVecTypeC* meteo,
const struct sfx_esm_param_C* model_param,
const struct sfx_surface_param* surface_param,
@@ -12,10 +12,10 @@ void esm_compute_flux_c (struct sfxDataVecTypeC* sfx,
const struct sfx_phys_constants* constants,
const int *grid_size)
{
- esm_compute_flux_cxx(sfx, meteo, model_param, surface_param, numerics, constants, *grid_size);
+ cxx_esm_compute_flux(sfx, meteo, model_param, surface_param, numerics, constants, *grid_size);
}
-void sheba_compute_flux_c (struct sfxDataVecTypeC* sfx,
+void c_sheba_compute_flux (struct sfxDataVecTypeC* sfx,
struct meteoDataVecTypeC* meteo,
const struct sfx_sheba_param_C* model_param,
const struct sfx_surface_param* surface_param,
@@ -23,5 +23,5 @@ void sheba_compute_flux_c (struct sfxDataVecTypeC* sfx,
const struct sfx_phys_constants* constants,
const int *grid_size)
{
- sheba_compute_flux_cxx(sfx, meteo, model_param, surface_param, numerics, constants, *grid_size);
+ cxx_sheba_compute_flux(sfx, meteo, model_param, surface_param, numerics, constants, *grid_size);
}
\ No newline at end of file
diff --git a/srcCXX/sfx_model_compute_flux_cxx.cpp b/srcCXX/sfx_model_compute_flux_cxx.cpp
index 82cb105f54a3082bbf3a6c94a29052031fab9410..40fca4b76d5272e12b691d51025559c357ca59f2 100644
--- a/srcCXX/sfx_model_compute_flux_cxx.cpp
+++ b/srcCXX/sfx_model_compute_flux_cxx.cpp
@@ -6,7 +6,7 @@
#include <vector>
// -------------------------------------------------------------------------- //
-void esm_compute_flux_cxx (sfxDataVecTypeC* sfx,
+void cxx_esm_compute_flux (sfxDataVecTypeC* sfx,
meteoDataVecTypeC* meteo,
const sfx_esm_param_C* model_param,
const sfx_surface_param* surface_param,
@@ -23,7 +23,7 @@ void esm_compute_flux_cxx (sfxDataVecTypeC* sfx,
#endif
}
-void sheba_compute_flux_cxx (sfxDataVecTypeC* sfx,
+void cxx_sheba_compute_flux (sfxDataVecTypeC* sfx,
meteoDataVecTypeC* meteo,
const sfx_sheba_param_C* model_param,
const sfx_surface_param* surface_param,
diff --git a/srcF/sfx_esm.f90 b/srcF/sfx_esm.f90
index 279daf4c356112d3db719f837016a978a80d30f6..d7732c6696c8fcc96fcd66ef693daedd65cdd342 100644
--- a/srcF/sfx_esm.f90
+++ b/srcF/sfx_esm.f90
@@ -56,8 +56,8 @@ module sfx_esm
end type
INTERFACE
- SUBROUTINE esm_compute_flux_f(sfx, meteo, model_param, surface_param, numerics, constants, grid_size) BIND(C, &
- name="esm_compute_flux_c")
+ SUBROUTINE c_esm_compute_flux(sfx, meteo, model_param, surface_param, numerics, constants, grid_size) BIND(C, &
+ name="c_esm_compute_flux")
use sfx_data
use, intrinsic :: ISO_C_BINDING, ONLY: C_INT, C_PTR
Import :: sfx_esm_param_C, sfx_esm_numericsType_C
@@ -69,7 +69,7 @@ module sfx_esm
type(sfx_surface_param) :: surface_param
type(sfx_esm_numericsType_C) :: numerics
type(sfx_phys_constants) :: constants
- END SUBROUTINE esm_compute_flux_f
+ END SUBROUTINE c_esm_compute_flux
END INTERFACE
#endif
@@ -131,7 +131,7 @@ contains
meteo_c_ptr = C_LOC(meteo_c)
sfx_c_ptr = C_LOC(sfx_c)
- call esm_compute_flux_f(sfx_c_ptr, meteo_c_ptr, model_param, surface_param, numerics_c, phys_constants, n)
+ call c_esm_compute_flux(sfx_c_ptr, meteo_c_ptr, model_param, surface_param, numerics_c, phys_constants, n)
#else
do i = 1, n
#ifdef SFX_FORCE_DEPRECATED_ESM_CODE
diff --git a/srcF/sfx_sheba.f90 b/srcF/sfx_sheba.f90
index c39ece7db24f9b0aeb5b528629c3aef407118adc..1940e960e4c4efe0ba8c83b3a060fdeb20406bc0 100644
--- a/srcF/sfx_sheba.f90
+++ b/srcF/sfx_sheba.f90
@@ -55,8 +55,8 @@ module sfx_sheba
end type
INTERFACE
- SUBROUTINE sheba_compute_flux_f(sfx, meteo, model_param, surface_param, numerics, constants, grid_size) BIND(C, &
- name="sheba_compute_flux_c")
+ SUBROUTINE c_sheba_compute_flux(sfx, meteo, model_param, surface_param, numerics, constants, grid_size) BIND(C, &
+ name="c_sheba_compute_flux")
use sfx_data
use, intrinsic :: ISO_C_BINDING, ONLY: C_INT, C_PTR
Import :: sfx_sheba_param_C, sfx_sheba_numericsType_C
@@ -68,7 +68,7 @@ module sfx_sheba
type(sfx_surface_param) :: surface_param
type(sfx_sheba_numericsType_C) :: numerics
type(sfx_phys_constants) :: constants
- END SUBROUTINE sheba_compute_flux_f
+ END SUBROUTINE c_sheba_compute_flux
END INTERFACE
#endif
@@ -130,7 +130,7 @@ contains
meteo_c_ptr = C_LOC(meteo_c)
sfx_c_ptr = C_LOC(sfx_c)
- call sheba_compute_flux_f(sfx_c_ptr, meteo_c_ptr, model_param, surface_param, numerics_c, phys_constants, n)
+ call c_sheba_compute_flux(sfx_c_ptr, meteo_c_ptr, model_param, surface_param, numerics_c, phys_constants, n)
#else
do i = 1, n
meteo_cell = meteoDataType(&