<p><b>duda</b> 2010-12-28 13:53:15 -0700 (Tue, 28 Dec 2010)</p><p>BRANCH COMMIT<br>
<br>
1) Add namelist option config_decomp_file_prefix, which is a character<br>
string specifying the prefix of mesh decomposition files (to be suffixed <br>
with the task count); this option is in the &io record with a default<br>
value of "graph.info.part."<br>
<br>
2) Add gfortran-serial target to top-level Makefile.<br>
<br>
<br>
M src/core_hyd_atmos/Registry<br>
M src/core_init_nhyd_atmos/Registry<br>
M src/core_sw/Registry<br>
M src/core_nhyd_atmos/Registry<br>
M src/core_ocean/Registry<br>
M src/framework/module_block_decomp.F<br>
M src/framework/Makefile<br>
M Makefile<br>
</p><hr noshade><pre><font color="gray">Modified: branches/atmos_nonhydrostatic/Makefile
===================================================================
--- branches/atmos_nonhydrostatic/Makefile        2010-12-28 20:48:48 UTC (rev 666)
+++ branches/atmos_nonhydrostatic/Makefile        2010-12-28 20:53:15 UTC (rev 667)
@@ -104,6 +104,18 @@
        "CORE = $(CORE)" \
        "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) -D_MPI -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+gfortran-serial:
+        ( make all \
+        "FC = gfortran" \
+        "CC = gcc" \
+        "SFC = gfortran" \
+        "SCC = gcc" \
+        "FFLAGS = -O3 -m64 -ffree-line-length-none -fdefault-real-8 -fconvert=big-endian" \
+        "CFLAGS = -O3 -m64" \
+        "LDFLAGS = -O3 -m64" \
+        "CORE = $(CORE)" \
+        "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+
g95:
        ( make all \
        "FC = mpif90" \
Modified: branches/atmos_nonhydrostatic/src/core_hyd_atmos/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_hyd_atmos/Registry        2010-12-28 20:48:48 UTC (rev 666)
+++ branches/atmos_nonhydrostatic/src/core_hyd_atmos/Registry        2010-12-28 20:53:15 UTC (rev 667)
@@ -23,6 +23,7 @@
namelist character io config_input_name grid.nc
namelist character io config_output_name output.nc
namelist character io config_restart_name restart.nc
+namelist character io config_decomp_file_prefix graph.info.part.
namelist integer restart config_restart_interval 0
namelist logical restart config_do_restart false
namelist real restart config_restart_time 172800.0
Modified: branches/atmos_nonhydrostatic/src/core_init_nhyd_atmos/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_init_nhyd_atmos/Registry        2010-12-28 20:48:48 UTC (rev 666)
+++ branches/atmos_nonhydrostatic/src/core_init_nhyd_atmos/Registry        2010-12-28 20:53:15 UTC (rev 667)
@@ -38,6 +38,7 @@
namelist character io config_input_name grid.nc
namelist character io config_output_name output.nc
namelist character io config_restart_name restart.nc
+namelist character io config_decomp_file_prefix graph.info.part.
namelist integer restart config_restart_interval 0
namelist logical restart config_do_restart false
namelist real restart config_restart_time 172800.0
Modified: branches/atmos_nonhydrostatic/src/core_nhyd_atmos/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_nhyd_atmos/Registry        2010-12-28 20:48:48 UTC (rev 666)
+++ branches/atmos_nonhydrostatic/src/core_nhyd_atmos/Registry        2010-12-28 20:53:15 UTC (rev 667)
@@ -35,6 +35,7 @@
namelist character io config_input_name grid.nc
namelist character io config_output_name output.nc
namelist character io config_restart_name restart.nc
+namelist character io config_decomp_file_prefix graph.info.part.
namelist integer restart config_restart_interval 0
namelist logical restart config_do_restart false
namelist real restart config_restart_time 172800.0
Modified: branches/atmos_nonhydrostatic/src/core_ocean/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_ocean/Registry        2010-12-28 20:48:48 UTC (rev 666)
+++ branches/atmos_nonhydrostatic/src/core_ocean/Registry        2010-12-28 20:53:15 UTC (rev 667)
@@ -7,9 +7,10 @@
namelist integer sw_model config_ntimesteps 7500
namelist integer sw_model config_output_interval 500
namelist integer sw_model config_stats_interval 100
-namelist character io config_input_name grid.nc
-namelist character io config_output_name output.nc
-namelist character io config_restart_name restart.nc
+namelist character io config_input_name grid.nc
+namelist character io config_output_name output.nc
+namelist character io config_restart_name restart.nc
+namelist character io config_decomp_file_prefix graph.info.part.
namelist integer restart config_restart_interval 0
namelist logical restart config_do_restart false
namelist real restart config_restart_time 172800.0
Modified: branches/atmos_nonhydrostatic/src/core_sw/Registry
===================================================================
--- branches/atmos_nonhydrostatic/src/core_sw/Registry        2010-12-28 20:48:48 UTC (rev 666)
+++ branches/atmos_nonhydrostatic/src/core_sw/Registry        2010-12-28 20:53:15 UTC (rev 667)
@@ -13,9 +13,10 @@
namelist logical sw_model config_positive_definite false
namelist logical sw_model config_monotonic false
namelist real sw_model config_apvm_upwinding 0.5
-namelist character io config_input_name grid.nc
-namelist character io config_output_name output.nc
-namelist character io config_restart_name restart.nc
+namelist character io config_input_name grid.nc
+namelist character io config_output_name output.nc
+namelist character io config_restart_name restart.nc
+namelist character io config_decomp_file_prefix graph.info.part.
namelist integer restart config_restart_interval 0
namelist logical restart config_do_restart false
namelist real restart config_restart_time 172800.0
Modified: branches/atmos_nonhydrostatic/src/framework/Makefile
===================================================================
--- branches/atmos_nonhydrostatic/src/framework/Makefile        2010-12-28 20:48:48 UTC (rev 666)
+++ branches/atmos_nonhydrostatic/src/framework/Makefile        2010-12-28 20:53:15 UTC (rev 667)
@@ -31,7 +31,7 @@
module_dmpar.o: module_sort.o streams.o
-module_block_decomp.o: module_grid_types.o module_hash.o
+module_block_decomp.o: module_grid_types.o module_hash.o module_configure.o
module_io_input.o: module_grid_types.o module_dmpar.o module_block_decomp.o module_sort.o module_configure.o $(ZOLTANOBJ)
Modified: branches/atmos_nonhydrostatic/src/framework/module_block_decomp.F
===================================================================
--- branches/atmos_nonhydrostatic/src/framework/module_block_decomp.F        2010-12-28 20:48:48 UTC (rev 666)
+++ branches/atmos_nonhydrostatic/src/framework/module_block_decomp.F        2010-12-28 20:53:15 UTC (rev 667)
@@ -18,6 +18,8 @@
subroutine block_decomp_cells_for_proc(dminfo, partial_global_graph_info, local_cell_list)
+ use configure
+
implicit none
type (dm_info), intent(in) :: dminfo
@@ -41,15 +43,15 @@
iunit = 50 + dminfo % my_proc_id
if (dminfo % nprocs < 10) then
- write(filename,'(a,i1)') 'graph.info.part.', dminfo % nprocs
+ write(filename,'(a,i1)') trim(config_decomp_file_prefix), dminfo % nprocs
else if (dminfo % nprocs < 100) then
- write(filename,'(a,i2)') 'graph.info.part.', dminfo % nprocs
+ write(filename,'(a,i2)') trim(config_decomp_file_prefix), dminfo % nprocs
else if (dminfo % nprocs < 1000) then
- write(filename,'(a,i3)') 'graph.info.part.', dminfo % nprocs
+ write(filename,'(a,i3)') trim(config_decomp_file_prefix), dminfo % nprocs
else if (dminfo % nprocs < 10000) then
- write(filename,'(a,i4)') 'graph.info.part.', dminfo % nprocs
+ write(filename,'(a,i4)') trim(config_decomp_file_prefix), dminfo % nprocs
else if (dminfo % nprocs < 100000) then
- write(filename,'(a,i5)') 'graph.info.part.', dminfo % nprocs
+ write(filename,'(a,i5)') trim(config_decomp_file_prefix), dminfo % nprocs
end if
open(unit=iunit, file=trim(filename), form='formatted', status='old', iostat=istatus)
</font>
</pre>