<p><b>mpetersen@lanl.gov</b> 2012-05-07 12:46:36 -0600 (Mon, 07 May 2012)</p><p>Remove monthly_forcing branch<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/io_node_last/src/core_ocean/mpas_ocn_mpas_core.F
===================================================================
--- branches/ocean_projects/io_node_last/src/core_ocean/mpas_ocn_mpas_core.F 2012-05-07 18:27:57 UTC (rev 1873)
+++ branches/ocean_projects/io_node_last/src/core_ocean/mpas_ocn_mpas_core.F 2012-05-07 18:46:36 UTC (rev 1874)
@@ -323,7 +323,7 @@
call mpas_get_time(curr_time=currTime, dateTimeString=timeStamp, ierr=ierr)
write(0,*) 'Initial time ', timeStamp
- call ocn_write_output_frame(output_obj, output_frame, domain)
+! mrp call ocn_write_output_frame(output_obj, output_frame, domain)
block_ptr => domain % blocklist
do while(associated(block_ptr))
Modified: branches/ocean_projects/io_node_last/src/core_ocean/mpas_ocn_time_integration.F
===================================================================
--- branches/ocean_projects/io_node_last/src/core_ocean/mpas_ocn_time_integration.F 2012-05-07 18:27:57 UTC (rev 1873)
+++ branches/ocean_projects/io_node_last/src/core_ocean/mpas_ocn_time_integration.F 2012-05-07 18:46:36 UTC (rev 1874)
@@ -98,10 +98,10 @@
do while (associated(block))
block % state % time_levs(2) % state % xtime % scalar = timeStamp
- if (isNaN(sum(block % state % time_levs(2) % state % u % array))) then
- write(0,*) 'Abort: NaN detected'
- call mpas_dmpar_abort(dminfo)
- endif
+! if (isNaN(sum(block % state % time_levs(2) % state % u % array))) then
+! write(0,*) 'Abort: NaN detected'
+! call mpas_dmpar_abort(dminfo)
+! endif
block => block % next
end do
Modified: branches/ocean_projects/io_node_last/src/driver/mpas_subdriver.F
===================================================================
--- branches/ocean_projects/io_node_last/src/driver/mpas_subdriver.F 2012-05-07 18:27:57 UTC (rev 1873)
+++ branches/ocean_projects/io_node_last/src/driver/mpas_subdriver.F 2012-05-07 18:46:36 UTC (rev 1874)
@@ -44,9 +44,9 @@
output_frame = 1
if(config_frames_per_outfile > 0) then
- call mpas_output_state_init(output_obj, domain, "OUTPUT", trim(timeStamp))
+!mrp call mpas_output_state_init(output_obj, domain, "OUTPUT", trim(timeStamp))
else
- call mpas_output_state_init(output_obj, domain, "OUTPUT")
+!mrp call mpas_output_state_init(output_obj, domain, "OUTPUT")
end if
Modified: branches/ocean_projects/io_node_last/src/framework/mpas_dmpar.F
===================================================================
--- branches/ocean_projects/io_node_last/src/framework/mpas_dmpar.F 2012-05-07 18:27:57 UTC (rev 1873)
+++ branches/ocean_projects/io_node_last/src/framework/mpas_dmpar.F 2012-05-07 18:46:36 UTC (rev 1874)
@@ -14,7 +14,11 @@
#endif
#endif
- integer, parameter :: IO_NODE = 0
+! mrp orig:
+! integer, parameter :: IO_NODE = 0
+! integer, parameter :: IO_NODE = 48
+ integer, parameter :: IO_NODE = 960
+
integer, parameter :: BUFSIZE = 6000
@@ -49,11 +53,19 @@
subroutine mpas_dmpar_init(dminfo, mpi_comm)
+! mrp temp for hostname
+!use IFPORT
+! mrp temp
implicit none
type (dm_info), intent(inout) :: dminfo
integer, intent(in), optional :: mpi_comm ! Optional: externally-supplied MPI communicator
+! mrp temp
+ character hostname*30
+ integer(4) istat
+! mrp temp
+
#ifdef _MPI
integer :: mpi_rank, mpi_size
integer :: mpi_ierr
@@ -74,8 +86,13 @@
dminfo % nprocs = mpi_size
dminfo % my_proc_id = mpi_rank
+! mrp change temp
write(0,'(a,i5,a,i5,a)') 'task ', mpi_rank, ' of ', mpi_size, &
' is running'
+! ISTAT = HOSTNAM (hostname)
+! write(0,'(a,i5,a,i5,2a)') 'task ', mpi_rank, ' of ', mpi_size, &
+! ' is running on node ',hostname(1:7)
+! mrp change end
call open_streams(dminfo % my_proc_id)
Modified: branches/ocean_projects/io_node_last/src/framework/mpas_io_input.F
===================================================================
--- branches/ocean_projects/io_node_last/src/framework/mpas_io_input.F 2012-05-07 18:27:57 UTC (rev 1873)
+++ branches/ocean_projects/io_node_last/src/framework/mpas_io_input.F 2012-05-07 18:46:36 UTC (rev 1874)
@@ -696,10 +696,10 @@
!
! Build ownership and exchange lists for vertical levels
- ! Essentially, process 0 owns all vertical levels when reading and writing,
+ ! Essentially, process IO_NODE owns all vertical levels when reading and writing,
! and it distributes them or gathers them to/from all other processes
!
- if (domain % dminfo % my_proc_id == 0) then
+ if (domain % dminfo % my_proc_id == IO_NODE) then
allocate(local_vertlevel_list(nVertLevels))
do i=1,nVertLevels
local_vertlevel_list(i) = i
Modified: branches/ocean_projects/io_node_last/src/framework/mpas_io_output.F
===================================================================
--- branches/ocean_projects/io_node_last/src/framework/mpas_io_output.F 2012-05-07 18:27:57 UTC (rev 1873)
+++ branches/ocean_projects/io_node_last/src/framework/mpas_io_output.F 2012-05-07 18:46:36 UTC (rev 1874)
@@ -259,7 +259,7 @@
end do
end do
- if (domain % dminfo % my_proc_id == 0) then
+ if (domain % dminfo % my_proc_id == IO_NODE) then
allocate(neededCellList(nCellsGlobal))
allocate(neededEdgeList(nEdgesGlobal))
allocate(neededVertexList(nVerticesGlobal))
@@ -384,7 +384,7 @@
integer :: nferr
integer, dimension(10) :: dimlist
- if (dminfo % my_proc_id == 0) then
+ if (dminfo % my_proc_id == IO_NODE) then
#ifdef OFFSET64BIT
nferr = nf_create(trim(output_obj % filename), ior(NF_CLOBBER,NF_64BIT_OFFSET), output_obj % wr_ncid)
#else
@@ -861,7 +861,7 @@
integer :: nferr
- if (dminfo % my_proc_id == 0) then
+ if (dminfo % my_proc_id == IO_NODE) then
nferr = nf_close(output_obj % wr_ncid)
end if
Modified: branches/ocean_projects/io_node_last/src/framework/streams.c
===================================================================
--- branches/ocean_projects/io_node_last/src/framework/streams.c 2012-05-07 18:27:57 UTC (rev 1873)
+++ branches/ocean_projects/io_node_last/src/framework/streams.c 2012-05-07 18:46:36 UTC (rev 1874)
@@ -18,7 +18,8 @@
{
char fname[128];
-#ifndef MPAS_DEBUG
+// mrp #ifndef MPAS_DEBUG
+#ifdef MPAS_WRITE_ONE_LOGFILE
if(*id == 0){
sprintf(fname, "log.%4.4i.err", *id);
fd_err = open(fname,O_CREAT|O_WRONLY|O_TRUNC,0644);
Modified: branches/ocean_projects/io_node_last/src/registry/gen_inc.c
===================================================================
--- branches/ocean_projects/io_node_last/src/registry/gen_inc.c 2012-05-07 18:27:57 UTC (rev 1873)
+++ branches/ocean_projects/io_node_last/src/registry/gen_inc.c 2012-05-07 18:46:36 UTC (rev 1874)
@@ -1074,7 +1074,7 @@
if (is_derived_dim(dim_ptr->name_in_code)) {
fortprintf(fd, " %sGlobal = domain %% blocklist %% mesh %% %s</font>
<font color="red">", dim_ptr->name_in_file, dim_ptr->name_in_code);
- fortprintf(fd, " if (domain %% dminfo %% my_proc_id == 0) then</font>
<font color="blue">");
+ fortprintf(fd, " if (domain %% dminfo %% my_proc_id == IO_NODE) then</font>
<font color="black">");
fortprintf(fd, " allocate(send%sList)</font>
<font color="black">", dim_ptr->name_in_file+1);
fortprintf(fd, " allocate(recv%sList)</font>
<font color="black">", dim_ptr->name_in_file+1);
fortprintf(fd, " nullify(send%sList %% next)</font>
<font color="gray">", dim_ptr->name_in_file+1);
@@ -1096,7 +1096,7 @@
fortprintf(fd, "</font>
<font color="red">");
}
else if (dim_ptr->constant_value > 0) {
- fortprintf(fd, " if (domain %% dminfo %% my_proc_id == 0) then</font>
<font color="blue">");
+ fortprintf(fd, " if (domain %% dminfo %% my_proc_id == IO_NODE) then</font>
<font color="black">");
fortprintf(fd, " allocate(send%sList)</font>
<font color="black">", dim_ptr->name_in_file);
fortprintf(fd, " allocate(recv%sList)</font>
<font color="black">", dim_ptr->name_in_file);
fortprintf(fd, " nullify(send%sList %% next)</font>
<font color="gray">", dim_ptr->name_in_file);
@@ -1119,7 +1119,7 @@
}
else if (dim_ptr->namelist_defined) {
fortprintf(fd, " %sGlobal = domain %% blocklist %% mesh %% %s</font>
<font color="red">", dim_ptr->name_in_file, dim_ptr->name_in_file);
- fortprintf(fd, " if (domain %% dminfo %% my_proc_id == 0) then</font>
<font color="blue">");
+ fortprintf(fd, " if (domain %% dminfo %% my_proc_id == IO_NODE) then</font>
<font color="black">");
fortprintf(fd, " allocate(send%sList)</font>
<font color="black">", dim_ptr->name_in_file+1);
fortprintf(fd, " allocate(recv%sList)</font>
<font color="black">", dim_ptr->name_in_file+1);
fortprintf(fd, " nullify(send%sList %% next)</font>
<font color="gray">", dim_ptr->name_in_file+1);
@@ -1142,7 +1142,7 @@
}
else {
fortprintf(fd, " %sGlobal = domain %% blocklist %% mesh %% %s</font>
<font color="red">", dim_ptr->name_in_code, dim_ptr->name_in_code);
- fortprintf(fd, " if (domain %% dminfo %% my_proc_id == 0) then</font>
<font color="blue">");
+ fortprintf(fd, " if (domain %% dminfo %% my_proc_id == IO_NODE) then</font>
<font color="black">");
fortprintf(fd, " allocate(send%sList)</font>
<font color="black">", dim_ptr->name_in_code+1);
fortprintf(fd, " allocate(recv%sList)</font>
<font color="black">", dim_ptr->name_in_code+1);
fortprintf(fd, " nullify(send%sList %% next)</font>
<font color="gray">", dim_ptr->name_in_code+1);
@@ -1187,7 +1187,7 @@
) {
if (is_derived_dim(dim_ptr->name_in_code)) {
- fortprintf(fd, " if (domain %% dminfo %% my_proc_id == 0) then</font>
<font color="blue">");
+ fortprintf(fd, " if (domain %% dminfo %% my_proc_id == IO_NODE) then</font>
<font color="black">");
fortprintf(fd, " deallocate(recv%sList %% list)</font>
<font color="black">", dim_ptr->name_in_file+1);
fortprintf(fd, " deallocate(send%sList %% list)</font>
<font color="black">", dim_ptr->name_in_file+1);
fortprintf(fd, " deallocate(send%sList)</font>
<font color="gray">", dim_ptr->name_in_file+1);
@@ -1195,7 +1195,7 @@
fortprintf(fd, " end if</font>
<font color="red">");
}
else if (dim_ptr->constant_value > 0) {
- fortprintf(fd, " if (domain %% dminfo %% my_proc_id == 0) then</font>
<font color="blue">");
+ fortprintf(fd, " if (domain %% dminfo %% my_proc_id == IO_NODE) then</font>
<font color="black">");
fortprintf(fd, " deallocate(recv%sList %% list)</font>
<font color="black">", dim_ptr->name_in_file);
fortprintf(fd, " deallocate(send%sList %% list)</font>
<font color="black">", dim_ptr->name_in_file);
fortprintf(fd, " deallocate(send%sList)</font>
<font color="gray">", dim_ptr->name_in_file);
@@ -1203,7 +1203,7 @@
fortprintf(fd, " end if</font>
<font color="red">");
}
else if (dim_ptr->namelist_defined) {
- fortprintf(fd, " if (domain %% dminfo %% my_proc_id == 0) then</font>
<font color="blue">");
+ fortprintf(fd, " if (domain %% dminfo %% my_proc_id == IO_NODE) then</font>
<font color="black">");
fortprintf(fd, " deallocate(recv%sList %% list)</font>
<font color="black">", dim_ptr->name_in_file+1);
fortprintf(fd, " deallocate(send%sList %% list)</font>
<font color="black">", dim_ptr->name_in_file+1);
fortprintf(fd, " deallocate(send%sList)</font>
<font color="gray">", dim_ptr->name_in_file+1);
@@ -1211,7 +1211,7 @@
fortprintf(fd, " end if</font>
<font color="red">");
}
else {
- fortprintf(fd, " if (domain %% dminfo %% my_proc_id == 0) then</font>
<font color="blue">");
+ fortprintf(fd, " if (domain %% dminfo %% my_proc_id == IO_NODE) then</font>
<font color="black">");
fortprintf(fd, " deallocate(recv%sList %% list)</font>
<font color="black">", dim_ptr->name_in_code+1);
fortprintf(fd, " deallocate(send%sList %% list)</font>
<font color="black">", dim_ptr->name_in_code+1);
fortprintf(fd, " deallocate(send%sList)</font>
<font color="black">", dim_ptr->name_in_code+1);
</font>
</pre>