--- MITgcm/optim/Makefile	2002/11/15 04:03:24	1.2
+++ MITgcm/optim/Makefile	2004/03/04 17:59:17	1.3
@@ -18,33 +18,19 @@
 			optim_write_control.F		\
 			simul.F
 
-OBJ		= optim_main.o			\
-                  optim_sub.o			\
-                  optim_numbmod.o		\
-                  optim_initmod.o		\
-                  optim_readdata.o		\
-                  optim_writedata.o		\
-                  optim_write_control.o		\
-                  simul.o
-
 EXEDIR     = ./
 
-# Location of library for optimization.
+# Location of cpp preprocessor
+# default is (Linux)
+CPP             = cat $< | /lib/cpp -P -traditional
 # on SUNOS
 # CPP		= cat $< | /usr/ccs/lib/cpp
-# on linux
-CPP		= cat $< | /lib/cpp
+
 INCLUDEDIRS     = -I.				\
-		  -I../bin/			\
-                  -I../eesupp/inc/		\
-                  -I../model/inc/ 		\
-                  -I../diags/inc/ 		\
-                  -I../pkg/ecco/ 		\
-                  -I../pkg/ctrl/
+		  -I../verification/natl_box_adjoint/build/
 
 LIBDIRS         = -L.				\
-                  -L../lsopt/			\
-		  -L/opt/SUNWspro/SC4.2/lib/v7
+                  -L../lsopt/
 
 LIBS            = -llsopt_ecco			\
 		  -lblas1
@@ -54,27 +40,36 @@
 EXECUTABLE      = $(EXEDIR)optim.x
 
 # The cpp flags.
-CPPFLAGS	= -DREAL_BYTE=8			\
-                  -DMAX_INDEPEND=29804		\
-                  -D_RL='double precision'	\
-                  -D$(OPTMODE)
+CPPFLAGS = -DREAL_BYTE=4		\
+	-DMAX_INDEPEND=1000000		\
+	-D_RL='double precision'	\
+	-D$(OPTMODE)
 
+#                -DMAX_INDEPEND=293570968        \
 # FORTRAN compiler and its flags.
-# for SUN
-#FC		= f77
-#FFLAGS		= -C
-# for Linux
-FC              = g77
-FFLAGS          = -Wimplicit -Wunused -Wuninitialized
+# default is (Linux)
+FC              = f77
+
+# SGI o3k IRIX64
+#FC              = f77
+#FFLAGS          = -extend_source -bytereclen -mips4 -r8 -static
+
+# AER cluster
+#FC		= /opt/mpich/bin/mpif77
+#FFLAGS		= -byteswapio -r8 -Mnodclchk -Mextend
 
 # File removal.
 RM		= rm -f
 
+SMALLF      = $(SRC:.F=.f)
+OBJECTS     = $(SRC:.F=.o)
+
 .SUFFIXES: .o .f .F
 
 all: $(EXECUTABLE)
-$(EXECUTABLE): $(OBJ)
-	$(FC) -o $@ $(FFLAGS) $(OBJ) $(LIBDIRS) $(LIBS)
+$(EXECUTABLE): $(OBJECTS)
+	$(FC) -o $@ $(FFLAGS) $(OBJECTS) $(LIBDIRS) $(LIBS)
+
 depend:
 	makedepend -o .f $(INCLUDEDIRS) $(SRC)
 
@@ -86,24 +81,10 @@
 
 # Cleaning options.
 clean:
-	$(RM) $(EXEDIR)optim.x $(OBJ)
+	$(RM) $(EXEDIR)optim.x *.o *.f
 
 scratch:
 	$(RM) OPWARMD OPWARMI $(EXEDIR)optim.x $(OBJ)
 
 # DO NOT DELETE
 
-optim_main.f: blas1.h
-optim_sub.f: ../bin/EEPARAMS.h ../bin/SIZE.h ../bin/ecco.h ../bin/ctrl.h
-optim_sub.f: optim.h
-optim_numbmod.f: ../bin/EEPARAMS.h ../bin/SIZE.h ../bin/ecco.h ../bin/ctrl.h
-optim_numbmod.f: optim.h minimization.h
-optim_initmod.f: ../bin/EEPARAMS.h ../bin/SIZE.h ../bin/ecco.h ../bin/ctrl.h
-optim_initmod.f: optim.h
-optim_readdata.f: ../bin/EEPARAMS.h ../bin/SIZE.h ../bin/ecco.h ../bin/ctrl.h
-optim_readdata.f: optim.h minimization.h
-optim_writedata.f: ../bin/EEPARAMS.h ../bin/SIZE.h ../bin/ecco.h
-optim_writedata.f: ../bin/ctrl.h optim.h minimization.h
-optim_write_control.f: ../bin/EEPARAMS.h ../bin/SIZE.h ../bin/ecco.h
-optim_write_control.f: ../bin/ctrl.h optim.h
-simul.f: ../bin/EEPARAMS.h ../bin/SIZE.h ../bin/ctrl.h