[cig-commits] r17095 - mc/3D/CitcomCU/trunk/src

[becker at geodynamics.org]

Author: becker
Date: 2010-08-17 10:17:47 -0700 (Tue, 17 Aug 2010)
New Revision: 17095

Modified:
   mc/3D/CitcomCU/trunk/src/Convection.c
   mc/3D/CitcomCU/trunk/src/Ggrd_handling.c
   mc/3D/CitcomCU/trunk/src/Instructions.c
   mc/3D/CitcomCU/trunk/src/Makefile.gzdir
   mc/3D/CitcomCU/trunk/src/Output_gzdir.c
Log:
Minor adjustments for compile with gzdir and ggrd options.



Modified: mc/3D/CitcomCU/trunk/src/Convection.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Convection.c	2010-08-16 22:30:59 UTC (rev 17094)
+++ mc/3D/CitcomCU/trunk/src/Convection.c	2010-08-17 17:17:47 UTC (rev 17095)
@@ -50,7 +50,7 @@
 
 void set_convection_defaults(struct All_variables *E)
 {
-  
+
   input_int("composition", &(E->control.composition), "0", E->parallel.me);
 
 	if(E->control.composition)

Modified: mc/3D/CitcomCU/trunk/src/Ggrd_handling.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Ggrd_handling.c	2010-08-16 22:30:59 UTC (rev 17094)
+++ mc/3D/CitcomCU/trunk/src/Ggrd_handling.c	2010-08-17 17:17:47 UTC (rev 17095)
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <mpi.h>
 #include "hc.h"
-#include "function_defs.h"
+#include "prototypes.h"
 
 /* ===============================
    Initialization of fields .....

Modified: mc/3D/CitcomCU/trunk/src/Instructions.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Instructions.c	2010-08-16 22:30:59 UTC (rev 17094)
+++ mc/3D/CitcomCU/trunk/src/Instructions.c	2010-08-17 17:17:47 UTC (rev 17095)
@@ -646,6 +646,8 @@
 	int m;
 
 	m = E->parallel.me;
+	
+	if(E->parallel.me == 0)fprintf(stderr, "ok20\n");
 
 	input_string("Problem", E->control.PROBLEM_TYPE, NULL, m);
 	if(strcmp(E->control.PROBLEM_TYPE, "convection") == 0)
@@ -667,6 +669,7 @@
 		E->control.CONVECTION = 1;
 		set_convection_defaults(E);
 	}
+	if(E->parallel.me == 0)fprintf(stderr, "ok21\n");
 
 	input_string("Geometry", E->control.GEOMETRY, NULL, m);
 	if(strcmp(E->control.GEOMETRY, "cart2d") == 0)
@@ -723,7 +726,6 @@
 		exit(0);
 	}
 
-
 	/* admin */
 
 	/* Information on which files to print, which variables of the flow to calculate and print.

Modified: mc/3D/CitcomCU/trunk/src/Makefile.gzdir
===================================================================
--- mc/3D/CitcomCU/trunk/src/Makefile.gzdir	2010-08-16 22:30:59 UTC (rev 17094)
+++ mc/3D/CitcomCU/trunk/src/Makefile.gzdir	2010-08-17 17:17:47 UTC (rev 17095)
@@ -18,9 +18,9 @@
 
 #COMPRESS=/usr/bin/compress
 COMPRESS=/bin/gzip
-GMT_DIR = ../../../GMTdev/GMT4.2.1/x86_64/
+GMT_DIR = ../../../GMTdev/GMT4.4.0/x86_64/lib/
 NETCDF_DIR = ../../../netcdf-3.6.2/
-HC_DIR = ../../../hc/
+HC_DIR = ../../../hc-svn/
 LIB_PATH= -L$(HC_DIR)/objects/x86_64/ -L$(GMT_DIR) -L$(NETCDF_DIR)/lib/
 #LIB_LIST= -lmpi
 LIB_LIST= -lz -lggrd -lhc -lgmt -lnetcdf

Modified: mc/3D/CitcomCU/trunk/src/Output_gzdir.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Output_gzdir.c	2010-08-16 22:30:59 UTC (rev 17094)
+++ mc/3D/CitcomCU/trunk/src/Output_gzdir.c	2010-08-17 17:17:47 UTC (rev 17095)
@@ -55,6 +55,7 @@
 
 #include "element_definitions.h"
 #include "global_defs.h"
+#include "prototypes.h"
 
 static gzFile *safe_gzopen(char *,char *);
 FILE *safe_fopen(char *,char *);