[cig-commits] r5448 - geodyn/3D/MoSST/trunk/mosst-dynamo

[wei at geodynamics.org]

Author: wei
Date: 2006-12-04 16:50:16 -0800 (Mon, 04 Dec 2006)
New Revision: 5448

Modified:
   geodyn/3D/MoSST/trunk/mosst-dynamo/Makefile
   geodyn/3D/MoSST/trunk/mosst-dynamo/bcs.f
   geodyn/3D/MoSST/trunk/mosst-dynamo/parameter.data
   geodyn/3D/MoSST/trunk/mosst-dynamo/run_v10
Log:
removed double quote in bcs.f, modified Makefile

Modified: geodyn/3D/MoSST/trunk/mosst-dynamo/Makefile
===================================================================
--- geodyn/3D/MoSST/trunk/mosst-dynamo/Makefile	2006-12-05 00:46:40 UTC (rev 5447)
+++ geodyn/3D/MoSST/trunk/mosst-dynamo/Makefile	2006-12-05 00:50:16 UTC (rev 5448)
@@ -1,12 +1,14 @@
 # Created by W. Mi 
 MAKE     = make --no-print-directory
 F90      = /opt/intel/fc/9.1.039/bin/ifort     # intel f90 compiler
-FCFLAGS  = -r8 -static -nofor_main -c -O2    # Compile flags
-FLFLAGS  = -static -r8  -O2                # Link flags
-LIBA1    = -lfftw3 -lblas -lm             # Library for mosstlib
-LIBA2    = -lintelsub90d -lfftw3 -lblas -lm     # Library for mosst
+G95      = /home/wei/bin/g95                   # g95 compiler
+GFORTRAN = /home/wei/bin/gfortran              # gfortran
+FCFLAGS  = -r8 -static -nofor_main -c -O2      # Compile flags
+FLFLAGS  = -static -r8  -O2                    # Link flags
+LIBA1    = -lfftw3 -lblas -lm                  # Library for mosstlib
+LIBA2    = -lintelsub90d -lfftw3 -lblas -lm    # Library for mosst
 LIBDIR   = -L../mosst-lib -L/usr/lib
-DEBUGS   = -fpp -D cts1 -D timepro # Debug option
+DEBUGS   = -fpp -D cts1 -D timepro             # Debug option
 
 MODULEOBJS  =  mod_params.o mod_geoms.o \
 	mod_artdis.o mod_anomaly.o mod_fields.o \
@@ -21,6 +23,9 @@
 	-if [ $(DEFAULTVALUE) = 0 ] ; then \
 		$(MAKE) $< ; \
 	fi
+
+all: libmosst main_dynamo
+
 main_dynamo: $(MODULEOBJS) $(OBJS:.o=.f)
 	$(F90) $(FLFLAGS) $(DEBUGS) -o $@ $(MODULEOBJS) $(OBJS:.o=.f) $(LIBA2) $(LIBDIR)
 $(MODULEOBJS):$(MODULEOBJS:.o=.f)
@@ -56,4 +61,4 @@
 	rm -f *.o
 	rm -f *.mod
 	rm -f main_dynamo
-	rm -f parameter.data
+#	rm -f parameter.data

Modified: geodyn/3D/MoSST/trunk/mosst-dynamo/bcs.f
===================================================================
--- geodyn/3D/MoSST/trunk/mosst-dynamo/bcs.f	2006-12-05 00:46:40 UTC (rev 5447)
+++ geodyn/3D/MoSST/trunk/mosst-dynamo/bcs.f	2006-12-05 00:50:16 UTC (rev 5448)
@@ -1,6 +1,6 @@
 c
 c	These group of subroutines provide inhomogeneous boundary
-c	conditions arising from finitely conducting D"-layer and
+c	conditions arising from finitely conducting D-layer and
 c	from CMB topography.
 c	The subroutines are running on Sun worksations with Sun
 c	Performance Library.

Modified: geodyn/3D/MoSST/trunk/mosst-dynamo/parameter.data
===================================================================
--- geodyn/3D/MoSST/trunk/mosst-dynamo/parameter.data	2006-12-05 00:46:40 UTC (rev 5447)
+++ geodyn/3D/MoSST/trunk/mosst-dynamo/parameter.data	2006-12-05 00:50:16 UTC (rev 5448)
@@ -60,7 +60,7 @@
 	version_out="fftw_v10"
 	fileno_out=1001
 	disc_diag="home"
-	subdir_diag="data"
+	subdir_diag="mosst-data"
 	version_diag="fftw_v10"
 	disc_anom="home"
 	subdir_anom="data"

Modified: geodyn/3D/MoSST/trunk/mosst-dynamo/run_v10
===================================================================
--- geodyn/3D/MoSST/trunk/mosst-dynamo/run_v10	2006-12-05 00:46:40 UTC (rev 5447)
+++ geodyn/3D/MoSST/trunk/mosst-dynamo/run_v10	2006-12-05 00:50:16 UTC (rev 5448)
@@ -1,4 +1,4 @@
-#/bin/rm parameter.data
+#bin/rm parameter.data
 
 #cp $HOME/research/src/model/params_v10.data parameter.data
 
@@ -60,4 +60,4 @@
 EOF
 
 #substitute your local MoSST path in the following line 
-$HOME/mosst-svn/trunk/mosst-dynamo/mode10 &
+$HOME/mosst-svn/trunk/mosst-dynamo/main_dynamo &