<p><b>dwj07@fsu.edu</b> 2013-01-31 10:07:49 -0700 (Thu, 31 Jan 2013)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Merging trunk to branch.<br>
</p><hr noshade><pre><font color="gray">Index: branches/ocean_projects/openmp_elements
===================================================================
--- branches/ocean_projects/openmp_elements 2013-01-31 17:05:58 UTC (rev 2403)
+++ branches/ocean_projects/openmp_elements 2013-01-31 17:07:49 UTC (rev 2404)
Property changes on: branches/ocean_projects/openmp_elements
___________________________________________________________________
Modified: svn:mergeinfo
## -25,3 +25,4 ##
/branches/omp_blocks/multiple_blocks:1803-2084
/branches/source_renaming:1082-1113
/branches/time_manager:924-962
+/trunk/mpas:2346-2403
\ No newline at end of property
Modified: branches/ocean_projects/openmp_elements/Makefile
===================================================================
--- branches/ocean_projects/openmp_elements/Makefile 2013-01-31 17:05:58 UTC (rev 2403)
+++ branches/ocean_projects/openmp_elements/Makefile 2013-01-31 17:07:49 UTC (rev 2404)
@@ -196,8 +196,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
@@ -287,10 +294,6 @@
OPENMP_MESSAGE="OpenMP is off."
endif
-ifneq ($(wildcard $(NETCDF)/lib/libnetcdff.*), ) # CHECK FOR NETCDF4
- LIBS += -lnetcdff
-endif # CHECK FOR NETCDF4
-
####################################################
# Section for adding external libraries and includes
####################################################
Index: branches/ocean_projects/openmp_elements/src/core_ocean
===================================================================
--- branches/ocean_projects/openmp_elements/src/core_ocean 2013-01-31 17:05:58 UTC (rev 2403)
+++ branches/ocean_projects/openmp_elements/src/core_ocean 2013-01-31 17:07:49 UTC (rev 2404)
Property changes on: branches/ocean_projects/openmp_elements/src/core_ocean
___________________________________________________________________
Modified: svn:mergeinfo
## -27,3 +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:2346-2403
\ No newline at end of property
Modified: branches/ocean_projects/openmp_elements/src/core_ocean/mpas_ocn_mpas_core.F
===================================================================
--- branches/ocean_projects/openmp_elements/src/core_ocean/mpas_ocn_mpas_core.F 2013-01-31 17:05:58 UTC (rev 2403)
+++ branches/ocean_projects/openmp_elements/src/core_ocean/mpas_ocn_mpas_core.F 2013-01-31 17:07:49 UTC (rev 2404)
@@ -184,11 +184,19 @@
type (MPAS_Time_Type) :: startTime, stopTime, alarmStartTime
type (MPAS_TimeInterval_type) :: runDuration, timeStep, alarmTimeStep
+ character(len=StrKIND) :: restartTimeStamp
integer :: ierr
- call mpas_set_time(curr_time=startTime, dateTimeString=config_start_time, ierr=ierr)
+ if(config_start_time == 'file') then
+ open(22,file='restart_timestamp',form='formatted',status='old')
+ read(22,*) restartTimeStamp
+ close(22)
+ call mpas_set_time(curr_time=startTime, dateTimeString=restartTimeStamp, ierr=ierr)
+ else
+ call mpas_set_time(curr_time=startTime, dateTimeString=config_start_time, ierr=ierr)
+ end if
+
call mpas_set_timeInterval(timeStep, dt=dt, ierr=ierr)
-
if (trim(config_run_duration) /= "none") then
call mpas_set_timeInterval(runDuration, timeString=config_run_duration, ierr=ierr)
call mpas_create_clock(clock, startTime=startTime, timeStep=timeStep, runDuration=runDuration, ierr=ierr)
Modified: branches/ocean_projects/openmp_elements/src/framework/mpas_io_input.F
===================================================================
--- branches/ocean_projects/openmp_elements/src/framework/mpas_io_input.F 2013-01-31 17:05:58 UTC (rev 2403)
+++ branches/ocean_projects/openmp_elements/src/framework/mpas_io_input.F 2013-01-31 17:07:49 UTC (rev 2404)
@@ -94,7 +94,7 @@
type (graph) :: partial_global_graph_info
type (MPAS_Time_type) :: startTime
- character(len=StrKIND) :: timeStamp
+ character(len=StrKIND) :: timeStamp, restartTimeStamp
character(len=StrKIND) :: filename
integer :: nHalos
@@ -103,9 +103,18 @@
if (config_do_restart) then
! this get followed by set is to ensure that the time is in standard format
- call mpas_set_time(curr_time=startTime, dateTimeString=config_start_time)
+ if(trim(config_start_time) == 'file') then
+ open(22,file='restart_timestamp',form='formatted',status='old')
+ read(22,*) restartTimeStamp
+ close(22)
+
+ else
+ restartTimeStamp = config_start_time
+ end if
+
+ write(0,*) 'RestartTimeStamp ', trim(restartTimeStamp)
+ call mpas_set_time(curr_time=startTime, dateTimeString=restartTimeStamp)
call mpas_get_time(curr_time=startTime, dateTimeString=timeStamp)
-
call mpas_insert_string_suffix(trim(config_restart_name), timeStamp, filename)
input_obj % filename = trim(filename)
@@ -256,11 +265,17 @@
! If doing a restart, we need to decide which time slice to read from the
! restart file
!
- input_obj % time = MPAS_seekStream(input_obj % io_stream, config_start_time, MPAS_STREAM_EXACT_TIME, timeStamp, ierr)
+ input_obj % time = MPAS_seekStream(input_obj % io_stream, restartTimeStamp, MPAS_STREAM_EXACT_TIME, timeStamp, ierr)
if (ierr == MPAS_IO_ERR) then
- write(0,*) 'Error: restart file '//trim(filename)//' did not contain time '//trim(config_start_time)
+ write(0,*) 'Error: restart file '//trim(filename)//' did not contain time '//trim(restartTimeStamp)
call mpas_dmpar_abort(domain % dminfo)
end if
+
+! input_obj % time = MPAS_seekStream(input_obj % io_stream, config_start_time, MPAS_STREAM_EXACT_TIME, timeStamp, ierr)
+! if (ierr == MPAS_IO_ERR) then
+! write(0,*) 'Error: restart file '//trim(filename)//' did not contain time '//trim(config_start_time)
+! call mpas_dmpar_abort(domain % dminfo)
+! end if
!write(0,*) 'MGD DEBUGGING time = ', input_obj % time
write(0,*) 'Restarting model from time ', trim(timeStamp)
end if
Modified: branches/ocean_projects/openmp_elements/src/framework/mpas_io_output.F
===================================================================
--- branches/ocean_projects/openmp_elements/src/framework/mpas_io_output.F 2013-01-31 17:05:58 UTC (rev 2403)
+++ branches/ocean_projects/openmp_elements/src/framework/mpas_io_output.F 2013-01-31 17:07:49 UTC (rev 2404)
@@ -48,6 +48,9 @@
else if (trim(stream) == 'RESTART') then
if(present(outputSuffix)) then
call mpas_insert_string_suffix(config_restart_name, outputSuffix, tempfilename)
+ open(22,file='restart_timestamp',form='formatted',status='replace')
+ write(22,*) outputSuffix
+ close(22)
else
tempfilename = config_restart_name
end if
</font>
</pre>