<p><b>dwj07@fsu.edu</b> 2012-12-18 13:31:07 -0700 (Tue, 18 Dec 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Fixing registry issues.<br>
        Adding $(CPPFLAGS) to cpp on Registry.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/generic_forcing/src/Makefile
===================================================================
--- branches/ocean_projects/generic_forcing/src/Makefile        2012-12-18 19:23:35 UTC (rev 2356)
+++ branches/ocean_projects/generic_forcing/src/Makefile        2012-12-18 20:31:07 UTC (rev 2357)
@@ -10,7 +10,6 @@
all: mpas
-
mpas: reg_includes externals frame ops dycore drver
        $(LINKER) $(LDFLAGS) -o $(CORE)_model.exe driver/*.o -L. -ldycore -lops -lframework $(LIBS) -I./external/esmf_time_f90 -L./external/esmf_time_f90 -lesmf_time
@@ -23,7 +22,7 @@
reg_includes:
        ( cd registry; $(MAKE) CC="$(SCC)" )
-        ( cd inc; $(CPP) ../core_$(CORE)/Registry | ../registry/parse > Registry.processed)
+        ( cd inc; $(CPP) $(CPPFLAGS) ../core_$(CORE)/Registry | ../registry/parse > Registry.processed)
frame: reg_includes externals
        ( cd framework; $(MAKE) CPPFLAGS="$(CPPFLAGS)" CPPINCLUDES="$(CPPINCLUDES)" all )
Modified: branches/ocean_projects/generic_forcing/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/generic_forcing/src/core_ocean/Registry        2012-12-18 19:23:35 UTC (rev 2356)
+++ branches/ocean_projects/generic_forcing/src/core_ocean/Registry        2012-12-18 20:31:07 UTC (rev 2357)
@@ -346,11 +346,11 @@
var persistent real evaporationFlux ( nCells ) 0 - evaporationFlux mesh - -
var persistent real seaIceHeatFlux ( nCells ) 0 - seaIceHeatFlux mesh - -
var persistent real snowFlux ( nCells ) 0 - snowFlux mesh - -
-var persistent real seaIceFreshWaterFlux ( nCells ) 0 - seaIceFreshWaterFlux - -
-var persistent real seaIceSalinityFlux ( nCells ) 0 - seaIceSalinityFlux - -
-var persistent real riverRunoffFlux ( nCells ) 0 - riverRunoffFlux - -
-var persistent real iceRunoffFlux ( nCells ) 0 - iceRunoffFlux - -
-var persistent real shortWaveHeatFlux ( nCells ) 0 - shortWaveHeatFlux - -
+var persistent real seaIceFreshWaterFlux ( nCells ) 0 - seaIceFreshWaterFlux mesh - -
+var persistent real seaIceSalinityFlux ( nCells ) 0 - seaIceSalinityFlux mesh - -
+var persistent real riverRunoffFlux ( nCells ) 0 - riverRunoffFlux mesh - -
+var persistent real iceRunoffFlux ( nCells ) 0 - iceRunoffFlux mesh - -
+var persistent real shortWaveHeatFlux ( nCells ) 0 - shortWaveHeatFlux mesh - -
var persistent real rainFlux ( nCells ) 0 - rainFlux mesh - -
var persistent real seaLevelPressure ( nCells ) 0 - seaLevelPressure mesh - -
var persistent real iceFraction ( nCells ) 0 - iceFraction mesh - -
</font>
</pre>