[cig-commits] [commit] master: makes types a include file (34ff521)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/relax

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/570a8ae866a884c414e8ec4b8e41b42244121721...ccb9b49ada03b6c80429c8a8fa8eaf5b6478b2e1

>---------------------------------------------------------------

commit 34ff5211921a981d6a196bd02840ccd0a7173435
Author: sagar masuti <sagar.masuti at gmail.com>
Date:   Mon Feb 2 11:21:51 2015 +0800

    makes types a include file


>---------------------------------------------------------------

34ff5211921a981d6a196bd02840ccd0a7173435
 INSTALL           | 7 +++++++
 src/curelax.f90   | 1 -
 src/elastic3d.f90 | 2 +-
 src/input.f90     | 2 +-
 src/relax.f90     | 1 -
 src/relaxlite.f90 | 3 +--
 src/types.f90     | 7 +------
 wscript           | 3 ---
 8 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/INSTALL b/INSTALL
index 6007eb3..7581f98 100644
--- a/INSTALL
+++ b/INSTALL
@@ -61,6 +61,13 @@ CPPFLAGS="-I/opt/GMT-4.5.7/netcdf/include" LDFLAGS="-L/usr/lib64 -lgdal" ./waf c
 ./waf build
 
 ---------
+relax library
+---------
+To configure the relax shared library 
+CFLAGS=-fPIC FCFLAGS=-fPIC ./waf configure --gmt-dir=/usr/local/GMT4.5.8/intel
+CFLAGS=-fPIC FCFLAGS=-fPIC ./waf lite
+
+---------
 GPU
 ---------
 To build Relax for NVIDIA GPUs on Linux, we need to provide certain command-line options
diff --git a/src/curelax.f90 b/src/curelax.f90
index e689857..8dde09d 100644
--- a/src/curelax.f90
+++ b/src/curelax.f90
@@ -190,7 +190,6 @@
   !------------------------------------------------------------------------
 PROGRAM relax
 
-  USE types
   USE input
   USE green
   USE green_space
diff --git a/src/elastic3d.f90 b/src/elastic3d.f90
index 454d0c7..30311d8 100644
--- a/src/elastic3d.f90
+++ b/src/elastic3d.f90
@@ -19,12 +19,12 @@
 
 MODULE elastic3d
 
-  USE types
   USE fourier
 
   IMPLICIT NONE
 
 #include "include.f90"
+#include "types.f90"
 
   REAL*8, PRIVATE, PARAMETER :: pi   = 3.141592653589793115997963468544185161_8
   REAL*8, PRIVATE, PARAMETER :: pi2  = 6.28318530717958623199592693708837032318_8
diff --git a/src/input.f90 b/src/input.f90
index 15c08c2..e4dc478 100644
--- a/src/input.f90
+++ b/src/input.f90
@@ -39,9 +39,9 @@ CONTAINS
   !! @param in
   !---------------------------------------------------------------------
   SUBROUTINE init(in)
-    USE types
     USE export
     USE getopt_m
+    USE elastic3d
 
     TYPE(SIMULATION_STRUCT), INTENT(OUT) :: in
 
diff --git a/src/relax.f90 b/src/relax.f90
index ea6c89d..6bfb6eb 100644
--- a/src/relax.f90
+++ b/src/relax.f90
@@ -190,7 +190,6 @@
   !------------------------------------------------------------------------
 PROGRAM relax
 
-  USE types
   USE input
   USE green
   USE green_space
diff --git a/src/relaxlite.f90 b/src/relaxlite.f90
index fb68b29..b7ee595 100644
--- a/src/relaxlite.f90
+++ b/src/relaxlite.f90
@@ -192,8 +192,6 @@
   !!   - export ductile zones for cylindrical and spherical geometries
   !------------------------------------------------------------------------
 SUBROUTINE relaxlite(in,gps,isverbose)
-  USE types
-!  USE input
   USE green
   USE green_space
   USE elastic3d
@@ -204,6 +202,7 @@ SUBROUTINE relaxlite(in,gps,isverbose)
 #include "include.f90"
   
   IMPLICIT NONE
+
   TYPE(SIMULATION_STRUCT), INTENT(INOUT) :: in
   TYPE(MANIFOLD_STRUCT), INTENT(OUT) :: gps(in%npts)
   LOGICAL, INTENT(IN) :: isverbose
diff --git a/src/types.f90 b/src/types.f90
index b733b03..029f43b 100644
--- a/src/types.f90
+++ b/src/types.f90
@@ -17,10 +17,6 @@
 ! along with RELAX.  If not, see <http://www.gnu.org/licenses/>.
 !-----------------------------------------------------------------------
 
-#include "include.f90"
-
-MODULE types
-  USE ISO_C_BINDING
 
   TYPE SOURCE_STRUCT
      SEQUENCE
@@ -98,7 +94,7 @@ MODULE types
      REAL*8, DIMENSION(:), ALLOCATABLE :: s1,s2,s3
   END TYPE MANIFOLD_STRUCT
 
-  TYPE, PUBLIC :: SIMULATION_STRUCT
+  TYPE :: SIMULATION_STRUCT
      ! grid dimension
      INTEGER :: sx1,sx2,sx3
 
@@ -228,4 +224,3 @@ MODULE types
 
   END TYPE SIMULATION_STRUCT
 
-END MODULE types
diff --git a/wscript b/wscript
index d063480..cebcf68 100644
--- a/wscript
+++ b/wscript
@@ -284,7 +284,6 @@ def configure(cnf):
 def lite(ctx) :
         ctx.shlib(features='c fc fcprogram',
                 source=['src/relaxlite.f90',
-                        'src/types.f90',
                         'src/ctfft.f',
                         'src/fourier.f90',
                         'src/green.f90',
@@ -318,7 +317,6 @@ def build(bld):
     if bld.env.CUDA:    
         bld.program(features='c fc fcprogram cxx',
                 source=['src/curelax.f90',
-                        'src/types.f90',
                         'src/ctfft.f',
                         'src/fourier.f90',
                         'src/green.f90',
@@ -346,7 +344,6 @@ def build(bld):
     else:
         bld.program(features='c fc fcprogram',
                 source=['src/relax.f90',
-                        'src/types.f90',
                         'src/ctfft.f',
                         'src/fourier.f90',
                         'src/green.f90',