<p><b>dwj07@fsu.edu</b> 2012-11-30 15:21:41 -0700 (Fri, 30 Nov 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Some minor edits to cesm coupling branch.<br>
<br>
        Changing some ESMF behaviors, and dmpar behaviors.<br>
<br>
        Adding in debugging print statments to mpas_io.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/cesm_coupling/src/framework/mpas_dmpar.F
===================================================================
--- branches/ocean_projects/cesm_coupling/src/framework/mpas_dmpar.F        2012-11-30 17:49:07 UTC (rev 2330)
+++ branches/ocean_projects/cesm_coupling/src/framework/mpas_dmpar.F        2012-11-30 22:21:41 UTC (rev 2331)
@@ -121,12 +121,10 @@
#ifdef _MPI
integer :: mpi_ierr
-#ifndef MPAS_CESM
if (.not. dminfo % using_external_comm) then
call MPI_Finalize(mpi_ierr)
end if
#endif
-#endif
end subroutine mpas_dmpar_finalize!}}}
Modified: branches/ocean_projects/cesm_coupling/src/framework/mpas_io.F
===================================================================
--- branches/ocean_projects/cesm_coupling/src/framework/mpas_io.F        2012-11-30 17:49:07 UTC (rev 2330)
+++ branches/ocean_projects/cesm_coupling/src/framework/mpas_io.F        2012-11-30 22:21:41 UTC (rev 2331)
@@ -176,11 +176,7 @@
type (fieldlist_type), pointer :: next => null()
end type fieldlist_type
-#ifdef MPAS_CESM
type (iosystem_desc_t), pointer, private, save :: pio_iosystem
-#else
- type (iosystem_desc_t), private, save :: pio_iosystem
-#endif
type (decomplist_type), pointer, private :: decomp_list => null()
type (dm_info), private :: local_dminfo
@@ -197,6 +193,7 @@
type (iosystem_desc_t), optional, pointer :: io_system
integer, intent(out), optional :: ierr
+! write(0,*) 'Called MPAS_io_init()'
if (present(ierr)) ierr = MPAS_IO_NOERR
local_dminfo = dminfo
@@ -204,6 +201,7 @@
if(present(io_system)) then
pio_iosystem => io_system
else
+!write(0,*) 'MGD PIO_init'
call PIO_init(local_dminfo % my_proc_id, & ! comp_rank
local_dminfo % comm, & ! comp_comm
io_task_count, & ! num_iotasks
@@ -516,6 +514,7 @@
logical :: found
integer :: pio_ierr
+! write(0,*) 'Called MPAS_io_inq_var()'
if (present(ierr)) ierr = MPAS_IO_NOERR
! Sanity checks
@@ -932,6 +931,7 @@
return
end if
+! write(0,*) 'Assigning ', size(indices), ' indices for ', trim(fieldname)
!
! Check whether the field has been defined
!
Modified: branches/ocean_projects/cesm_coupling/src/framework/mpas_timekeeping.F
===================================================================
--- branches/ocean_projects/cesm_coupling/src/framework/mpas_timekeeping.F        2012-11-30 17:49:07 UTC (rev 2330)
+++ branches/ocean_projects/cesm_coupling/src/framework/mpas_timekeeping.F        2012-11-30 22:21:41 UTC (rev 2331)
@@ -117,15 +117,7 @@
character (len=*), intent(in) :: calendar
#ifdef MPAS_CESM
- if (trim(calendar) == 'gregorian') then
- TheCalendar = MPAS_GREGORIAN
- call ESMF_Initialize(defaultCalendar=ESMF_CALKIND_GREGORIAN)
- else if (trim(calendar) == 'gregorian_noleap') then
- TheCalendar = MPAS_GREGORIAN_NOLEAP
- call ESMF_Initialize(defaultCalendar=ESMF_CALKIND_NOLEAP)
- else
- write(0,*) 'ERROR: mpas_timekeeping_init: Invalid calendar type'
- end if
+ TheCalendar = defaultCal % Type % caltype - 1
#else
if (trim(calendar) == 'gregorian') then
TheCalendar = MPAS_GREGORIAN
@@ -148,7 +140,7 @@
implicit none
-#ifndef MPAS_CESM
+#ifndef MPAS_CESM
call ESMF_Finalize()
#endif
</font>
</pre>