<p><b>dwj07@fsu.edu</b> 2012-08-15 11:12:18 -0600 (Wed, 15 Aug 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Changing _BITREPRODUCIBLE flag to MPAS_BITREPRODUCIBLE.<br>
        Adding controls to Makefile.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/option1_b4b_test/Makefile
===================================================================
--- branches/ocean_projects/option1_b4b_test/Makefile        2012-08-14 21:33:46 UTC (rev 2101)
+++ branches/ocean_projects/option1_b4b_test/Makefile        2012-08-15 17:12:18 UTC (rev 2102)
@@ -131,7 +131,7 @@
        "DEBUG = $(DEBUG)" \
        "SERIAL = $(SERIAL)" \
        "USE_PAPI = $(USE_PAPI)" \
-        "CPPFLAGS = $(MODEL_FORMULATION) -DUNDERSCORE -D_BITREPRODUCIBLE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+        "CPPFLAGS = $(MODEL_FORMULATION) -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
g95:
        ( $(MAKE) all \
@@ -267,6 +267,13 @@
        PAPI_MESSAGE="Papi libraries are off."
endif # USE_PAPI IF
+ifeq "$(B4B)" "true"
+        CPPINCLUDES += -DMPAS_BITREPRODUCIBLE
+        B4B_MESSAGE="Bit Reprodicibility is on."
+else
+        B4B_MESSAGE="Bit Reprodicibility is off."
+endif
+
ifneq ($(wildcard $(NETCDF)/lib/libnetcdff.*), ) # CHECK FOR NETCDF4
        LIBS += -lnetcdff
endif # CHECK FOR NETCDF4
@@ -306,6 +313,7 @@
        @echo $(DEBUG_MESSAGE)
        @echo $(SERIAL_MESSAGE)
        @echo $(PAPI_MESSAGE)
+        @echo $(B4B_MESSAGE)
clean:
        cd src; $(MAKE) clean RM="$(RM)" CORE="$(CORE)"
        $(RM) $(CORE)_model.exe
Modified: branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tendency.F
===================================================================
--- branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tendency.F        2012-08-14 21:33:46 UTC (rev 2101)
+++ branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tendency.F        2012-08-15 17:12:18 UTC (rev 2102)
@@ -582,7 +582,7 @@
ke(:,:) = 0.0
v(:,:) = 0.0
do iEdge=1,nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
@@ -637,7 +637,7 @@
!
kev(:,:) = 0.0; kevc(:,:) = 0.0
do iEdge=1,nEdges*ke_vertex_flag
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
@@ -654,7 +654,7 @@
enddo
enddo
do iVertex = 1, nVertices*ke_vertex_flag
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
vertexIndex = vertexPermute(iVertex)
#else
vertexIndex = iVertex
@@ -711,7 +711,7 @@
Vor_cell(:,:) = 0.0
Vor_edge(:,:) = 0.0
do iVertex = 1,nVertices
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
vertexIndex = vertexPermute(iVertex)
#else
vertexIndex = iVertex
@@ -941,7 +941,7 @@
!
div_hu(:,:) = 0.0
do iEdge=1,nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
Modified: branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_thick_hadv.F
===================================================================
--- branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_thick_hadv.F        2012-08-14 21:33:46 UTC (rev 2101)
+++ branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_thick_hadv.F        2012-08-15 17:12:18 UTC (rev 2102)
@@ -134,7 +134,7 @@
edgePermute => grid % edgePermute % array
do iEdge=1,nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
Modified: branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_time_integration_split.F
===================================================================
--- branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_time_integration_split.F        2012-08-14 21:33:46 UTC (rev 2101)
+++ branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_time_integration_split.F        2012-08-15 17:12:18 UTC (rev 2102)
@@ -411,7 +411,7 @@
! config_btr_gam1_uWt1= 0 flux = uBtrOld*H
! mrp 120201 efficiency: could we combine the following edge and cell loops?
do iEdge=1,block % mesh % nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = block % mesh % edgePermute % array(iEdge)
#else
edgeIndex = iEdge
@@ -514,7 +514,7 @@
! config_btr_gam3_uWt2= 0 flux = uBtrOld*H
! mrp 120201 efficiency: could we combine the following edge and cell loops?
do iEdge=1,block % mesh % nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = block % mesh % edgePermute % array(iEdge)
#else
edgeIndex = iEdge
Modified: branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tracer_advection_mono.F
===================================================================
--- branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tracer_advection_mono.F        2012-08-14 21:33:46 UTC (rev 2101)
+++ branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tracer_advection_mono.F        2012-08-15 17:12:18 UTC (rev 2102)
@@ -243,7 +243,7 @@
! Store left over high order flux in high_order_horiz_flux array
! Upwind fluxes are accumulated in upwind_tendency
do iEdge = 1, nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
@@ -313,7 +313,7 @@
! Accumulate the scaled high order horizontal tendencies
do iEdge = 1, nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
Modified: branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del2.F
===================================================================
--- branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del2.F        2012-08-14 21:33:46 UTC (rev 2101)
+++ branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del2.F        2012-08-15 17:12:18 UTC (rev 2102)
@@ -152,7 +152,7 @@
! compute a boundary mask to enforce insulating boundary conditions in the horizontal
!
do iEdge=1,nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
Modified: branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del4.F
===================================================================
--- branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del4.F        2012-08-14 21:33:46 UTC (rev 2101)
+++ branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_tracer_hmix_del4.F        2012-08-15 17:12:18 UTC (rev 2102)
@@ -158,7 +158,7 @@
! first del2: div(h </font>
<font color="gray">abla \phi) at cell center
do iEdge=1,nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
@@ -187,7 +187,7 @@
! second del2: div(h </font>
<font color="gray">abla [delsq_tracer]) at cell center
do iEdge=1,grid % nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
Modified: branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_vel_hmix_del4.F
===================================================================
--- branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_vel_hmix_del4.F        2012-08-14 21:33:46 UTC (rev 2101)
+++ branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_vel_hmix_del4.F        2012-08-15 17:12:18 UTC (rev 2102)
@@ -160,7 +160,7 @@
delsq_divergence(:,:) = 0.0
do iEdge=1,nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAs_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
Modified: branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_vmix_coefs_rich.F
===================================================================
--- branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_vmix_coefs_rich.F        2012-08-14 21:33:46 UTC (rev 2101)
+++ branches/ocean_projects/option1_b4b_test/src/core_ocean/mpas_ocn_vmix_coefs_rich.F        2012-08-15 17:12:18 UTC (rev 2102)
@@ -502,7 +502,7 @@
! interpolate du2TopOfEdge to du2TopOfCell
du2TopOfCell = 0.0
do iEdge=1,nEdges
-#ifdef _BITREPRODUCIBLE
+#ifdef MPAS_BITREPRODUCIBLE
edgeIndex = edgePermute(iEdge)
#else
edgeIndex = iEdge
</font>
</pre>