<p><b>mpetersen@lanl.gov</b> 2013-02-01 13:24:53 -0700 (Fri, 01 Feb 2013)</p><p>branch commit: namelist. Merged trunk to branch. Added missing flag to namelist.input.ocean.<br>
</p><hr noshade><pre><font color="gray">Index: branches/ocean_projects/namelist_cleanup
===================================================================
--- branches/ocean_projects/namelist_cleanup        2013-02-01 19:54:42 UTC (rev 2413)
+++ branches/ocean_projects/namelist_cleanup        2013-02-01 20:24:53 UTC (rev 2414)
Property changes on: branches/ocean_projects/namelist_cleanup
___________________________________________________________________
Modified: svn:mergeinfo
## -25,4 +25,4 ##
/branches/omp_blocks/multiple_blocks:1803-2084
/branches/source_renaming:1082-1113
/branches/time_manager:924-962
-/trunk/mpas:2318-2372
+/trunk/mpas:2318-2409
\ No newline at end of property
Modified: branches/ocean_projects/namelist_cleanup/Makefile
===================================================================
--- branches/ocean_projects/namelist_cleanup/Makefile        2013-02-01 19:54:42 UTC (rev 2413)
+++ branches/ocean_projects/namelist_cleanup/Makefile        2013-02-01 20:24:53 UTC (rev 2414)
@@ -195,8 +195,15 @@
CPPINCLUDES = -I../inc -I$(NETCDF)/include -I$(PIO) -I$(PNETCDF)/include
FCINCLUDES = -I../inc -I$(NETCDF)/include -I$(PIO) -I$(PNETCDF)/include
-LIBS = -L$(PIO) -L$(PNETCDF)/lib -L$(NETCDF)/lib -lpio -lpnetcdf -lnetcdf
+LIBS = -L$(PIO) -L$(PNETCDF)/lib -L$(NETCDF)/lib -lpio -lpnetcdf
+NCLIB = -lnetcdf
+NCLIBF = -lnetcdff
+ifneq ($(wildcard $(NETCDF)/lib/libnetcdff.*), ) # CHECK FOR NETCDF4
+        LIBS += $(NCLIBF)
+endif # CHECK FOR NETCDF4
+LIBS += $(NCLIB)
+
RM = rm -f
CPP = cpp -C -P -traditional
RANLIB = ranlib
@@ -277,9 +284,6 @@
        TAU_MESSAGE="TAU Hooks are off."
endif
-ifneq ($(wildcard $(NETCDF)/lib/libnetcdff.*), ) # CHECK FOR NETCDF4
-        LIBS += -lnetcdff
-endif # CHECK FOR NETCDF4
####################################################
# Section for adding external libraries and includes
Modified: branches/ocean_projects/namelist_cleanup/namelist.input.ocean
===================================================================
--- branches/ocean_projects/namelist_cleanup/namelist.input.ocean        2013-02-01 19:54:42 UTC (rev 2413)
+++ branches/ocean_projects/namelist_cleanup/namelist.input.ocean        2013-02-01 20:24:53 UTC (rev 2414)
@@ -135,6 +135,9 @@
        config_btr_gam3_uWt2 = 1.0
        config_btr_solve_SSH2 = .false.
/
+&sw_model
+ config_test_case = 0
+/
&debug
        config_check_zlevel_consistency = .false.
        config_filter_btr_mode = .false.
Index: branches/ocean_projects/namelist_cleanup/src/core_ocean
===================================================================
--- branches/ocean_projects/namelist_cleanup/src/core_ocean        2013-02-01 19:54:42 UTC (rev 2413)
+++ branches/ocean_projects/namelist_cleanup/src/core_ocean        2013-02-01 20:24:53 UTC (rev 2414)
Property changes on: branches/ocean_projects/namelist_cleanup/src/core_ocean
___________________________________________________________________
Modified: svn:mergeinfo
## -27,4 +27,4 ##
/branches/omp_blocks/openmp_test/src/core_ocean_elements:2161-2201
/branches/source_renaming/src/core_ocean:1082-1113
/branches/time_manager/src/core_ocean:924-962
-/trunk/mpas/src/core_ocean:2318-2372
+/trunk/mpas/src/core_ocean:2318-2409
\ No newline at end of property
Modified: branches/ocean_projects/namelist_cleanup/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/namelist_cleanup/src/core_ocean/Registry        2013-02-01 19:54:42 UTC (rev 2413)
+++ branches/ocean_projects/namelist_cleanup/src/core_ocean/Registry        2013-02-01 20:24:53 UTC (rev 2414)
@@ -1,8 +1,6 @@
%
% namelist type namelist_record name default_value
%
-namelist integer sw_model config_test_case 0
-
namelist logical time_management config_do_restart .false.
namelist character time_management config_start_time '0000-01-01_00:00:00'
namelist character time_management config_stop_time 'none'
@@ -119,6 +117,8 @@
namelist real split_explicit_ts config_btr_gam3_uWt2 1.0
namelist logical split_explicit_ts config_btr_solve_SSH2 .false.
+namelist integer sw_model config_test_case 0
+
namelist logical debug config_check_zlevel_consistency .false.
namelist logical debug config_filter_btr_mode .false.
namelist logical debug config_prescribe_velocity .false.
</font>
</pre>