[cig-commits] r22504 - seismo/2D/SPECFEM2D/trunk/src/specfem2D

[elliott.sales.de.andrade at geodynamics.org]

Author: elliott.sales.de.andrade
Date: 2013-07-02 23:32:44 -0700 (Tue, 02 Jul 2013)
New Revision: 22504

Modified:
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/attenuation_compute_param.c
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/write_jpeg_image.c
Log:
Correctly set up Fortran-to-C wrapper names.

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/attenuation_compute_param.c
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/attenuation_compute_param.c	2013-07-03 06:32:37 UTC (rev 22503)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/attenuation_compute_param.c	2013-07-03 06:32:44 UTC (rev 22504)
@@ -3,6 +3,7 @@
 
 /* cleaned by Dimitri Komatitsch, University of Pau, France, July 2007 */
 
+#include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -16,14 +17,14 @@
 #define PI 3.14159265358979
 #define PI2 6.28318530717958
 
-/* Underscores should or should not follow this function name, depending on the compiler and its options.
-   It is called in "attenuation_model.f90".
-*/
-void attenuation_compute_param_(int *nmech_in, double *Q1_in, double *Q2_in, double *f1_in, double *f2_in,
+/* It is called in "attenuation_model.f90". */
+void
+FC_FUNC_(attenuation_compute_param,ATTENUATION_COMPUTE_PARAM)(int *nmech_in,
+             double *Q1_in, double *Q2_in,
+             double *f1_in, double *f2_in,
              double *tau_sigma_nu1, double *tau_sigma_nu2,
              double *tau_epsilon_nu1, double *tau_epsilon_nu2
              )
-
 {
   int             xmgr, n, i, j, plot, nu;
   double          Q_value, target_Q1, target_Q2;

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/write_jpeg_image.c
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/write_jpeg_image.c	2013-07-03 06:32:37 UTC (rev 22503)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/write_jpeg_image.c	2013-07-03 06:32:44 UTC (rev 22504)
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include "libjpeg/jpeglib.h"
 #include <stdlib.h>
@@ -16,7 +17,12 @@
  *
  * "raw_image" points to the raw, uncompressed image
  */
-int write_jpeg_image_( unsigned char *raw_image, int *width_in, int *height_in, char *filename )
+int
+FC_FUNC_(write_jpeg_image,WRITE_JPEG_IMAGE)(
+  unsigned char *raw_image,
+  int *width_in,
+  int *height_in,
+  char *filename)
 {
 
   struct jpeg_compress_struct cinfo;