<p><b>dwj07@fsu.edu</b> 2013-02-04 11:42:14 -0700 (Mon, 04 Feb 2013)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Adding build of cvmix to MPAS-O.<br>
        And checkout using externals directory.<br>
</p><hr noshade><pre><font color="gray">Index: branches/ocean_projects/cvmix_implementation/src/core_ocean
===================================================================
--- branches/ocean_projects/cvmix_implementation/src/core_ocean        2013-02-04 18:12:21 UTC (rev 2419)
+++ branches/ocean_projects/cvmix_implementation/src/core_ocean        2013-02-04 18:42:14 UTC (rev 2420)
Property changes on: branches/ocean_projects/cvmix_implementation/src/core_ocean
___________________________________________________________________
Added: svn:externals
## -0,0 +1 ##
+cvmix http://cvmix.googlecode.com/svn/trunk/src/shared
Modified: branches/ocean_projects/cvmix_implementation/src/core_ocean/Makefile
===================================================================
--- branches/ocean_projects/cvmix_implementation/src/core_ocean/Makefile        2013-02-04 18:12:21 UTC (rev 2419)
+++ branches/ocean_projects/cvmix_implementation/src/core_ocean/Makefile        2013-02-04 18:42:14 UTC (rev 2420)
@@ -5,7 +5,7 @@
mpas_ocn_advection.o \
         mpas_ocn_thick_hadv.o \
         mpas_ocn_thick_vadv.o \
- mpas_ocn_gm.o \
+ mpas_ocn_gm.o \
         mpas_ocn_vel_coriolis.o \
         mpas_ocn_vel_vadv.o \
         mpas_ocn_vel_hmix.o \
@@ -57,11 +57,14 @@
         mpas_ocn_time_average.o \
         mpas_ocn_monthly_forcing.o
-all: core_hyd
+all: libcvmix dycore
-core_hyd: $(OBJS)
-        ar -ru libdycore.a $(OBJS)
+libcvmix:
+        (cd cvmix; make all FC="$(FC)" FFLAGS="$(FFLAGS)" FINCLUDES="$(FINCLUDES)")
+dycore: libcvmix $(OBJS)
+        ar -ru libdycore.a $(OBJS) cvmix/*.o
+
mpas_ocn_test_cases.o:
mpas_ocn_advection.o:
@@ -172,8 +175,7 @@
mpas_ocn_monthly_forcing.o:
-mpas_ocn_mpas_core.o: mpas_ocn_mpas_core.o \
-                         mpas_ocn_test_cases.o \
+mpas_ocn_mpas_core.o: mpas_ocn_test_cases.o \
                                         mpas_ocn_advection.o \
                                         mpas_ocn_thick_hadv.o \
mpas_ocn_gm.o \
@@ -230,8 +232,9 @@
clean:
        $(RM) *.o *.mod *.f90 libdycore.a
+        (cd cvmix; make clean RM="$(RM)")
.F.o:
        $(RM) $@ $*.mod
        $(CPP) $(CPPFLAGS) $(CPPINCLUDES) $< > $*.f90
-        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../external/esmf_time_f90
+        $(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I../external/esmf_time_f90 -Icvmix/
Added: branches/ocean_projects/cvmix_implementation/src/core_ocean/SVN_EXTERNAL_DIRECTORIES
===================================================================
--- branches/ocean_projects/cvmix_implementation/src/core_ocean/SVN_EXTERNAL_DIRECTORIES         (rev 0)
+++ branches/ocean_projects/cvmix_implementation/src/core_ocean/SVN_EXTERNAL_DIRECTORIES        2013-02-04 18:42:14 UTC (rev 2420)
@@ -0,0 +1 @@
+cvmix http://cvmix.googlecode.com/svn/trunk/src/shared
</font>
</pre>