Language function rename

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,

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

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,

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

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(&