[cig-commits] [commit] master: Minor fixes to compile. (57ff192)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/citcomcu

On branch  : master
Link       : https://github.com/geodynamics/citcomcu/compare/d110064e167149bdb72938228c251f7851095b0b...57ff192d0af572e2c6d174bf3bd732e7d2f8b595

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

commit 57ff192d0af572e2c6d174bf3bd732e7d2f8b595
Author: thwbecker <thorstinski at gmail.com>
Date:   Tue Oct 15 13:01:09 2013 -0700

    Minor fixes to compile.


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

57ff192d0af572e2c6d174bf3bd732e7d2f8b595
 src/Anisotropic_viscosity.c | 4 ++--
 src/Makefile.gzdir_ani      | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Anisotropic_viscosity.c b/src/Anisotropic_viscosity.c
index ee99223..e7255f6 100644
--- a/src/Anisotropic_viscosity.c
+++ b/src/Anisotropic_viscosity.c
@@ -30,7 +30,7 @@ EDIT THE FILES in hc, not the citcom subdirectories
 
 
 #else  /* CU */
-   void ggrd_read_anivisc_from_file(struct All_variables *);
+   void ggrd_read_anivisc_from_file_cu(struct All_variables *);
 #endif
 
 #include "anisotropic_viscosity.h"
@@ -383,7 +383,7 @@ void set_anisotropic_viscosity_at_element_level(struct All_variables *E,
       else			/* regional */
 	ggrd_read_anivisc_from_file(E,0);
 #else  /* CitcomCU */
-      ggrd_read_anivisc_from_file(E);
+      ggrd_read_anivisc_from_file_cu(E);
 #endif
       break;
     case 6:		
diff --git a/src/Makefile.gzdir_ani b/src/Makefile.gzdir_ani
index 1697396..075d286 100644
--- a/src/Makefile.gzdir_ani
+++ b/src/Makefile.gzdir_ani
@@ -20,8 +20,7 @@
 COMPRESS=/bin/gzip
 GMT_DIR = $(GMTHOME)
 NETCDF_DIR = $(NETCDFHOME)
-HC_DIR = ../../../hc-svn/
-LIB_PATH= -L$(HC_DIR)/objects/x86_64/ -L$(GMT_DIR)/lib/ -L$(NETCDF_DIR)/lib/
+LIB_PATH= -L$(HC_HOME)/objects/x86_64/ -L$(GMT_DIR)/lib/ -L$(NETCDF_DIR)/lib/
 LIB_LIST= -lz -lggrd -lhc -lgmt -lnetcdf
 
 
@@ -36,7 +35,7 @@ LIB= $(LIB_PATH) $(LIB_LIST) $(EXPO_LIBS)  -lm
 
 DEFINES =  \
 	-DUSE_GZDIR -DUSE_GGRD -DCITCOM_ALLOW_ANISOTROPIC_VISC \
-	-I$(HC_DIR)/  $(EXPO_DEFINE) \
+	-I$(HC_HOME)/  $(EXPO_DEFINE) \
 	 -I$(GMT_DIR)/include/ -I$(NETCDF_DIR)/include/\
 	-DPREM_MODEL_FILE=\"$(PWD)/prem/prem.dat\"
 
@@ -61,7 +60,7 @@ LinuxFLAGS=
 LinuxLDFLAGS=
 #LinuxOPTIM=-g -O0 -Werror $(DEFINES)
 #LinuxOPTIM=-O3 -mtune=core2 -Werror $(DEFINES)
-LinuxOPTIM=-O2 -Werror $(DEFINES)
+LinuxOPTIM=-O2  $(DEFINES)
 
 ####################################
 #PARAGON