Merge branch 'hotfix-v6.3'

This merge addresses two minor issues in MPAS-Atmosphere.

1) The default setting for config_o3climatology was previously 'false',
   which caused the model to use a single seasonal ozone profile everywhere
   in the model domain when the RRTMG radiation schemes was used. The default
   is now 'true', which causes the model to use the same monthly ozone
   climatology for RRTMG as is used by the CAM radiation schemes.

2) Model simulations using a non-integer timestep would result in 'xtime'
   variables in model output files that were incorrect, which caused problems
   when trying to restart the model at the correct time. The xtime variable
   is now correct when the valid time of output files has no fractional
   seconds.

* hotfix-v6.3:
  Fix incorrect 'xtime' variable for fractional dt
  In ./src/core_atmosphere/Registry.xml, switch the default value of the logical config_o3climatology from false to true.
  Increment version number to 6.3

Author: mgduda

README.md

@@ -1,4 +1,4 @@
-MPAS-v6.2
+MPAS-v6.3
 ====
 
 The Model for Prediction Across Scales (MPAS) is a collaborative project for

src/core_atmosphere/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="atmosphere" core_abbrev="atm" version="6.2">
+<registry model="mpas" core="atmosphere" core_abbrev="atm" version="6.3">
 
 <!-- **************************************************************************************** -->
 <!-- ************************************** Dimensions ************************************** -->
@@ -1742,7 +1742,7 @@
                      description="logical for configuration of deep soil temperatures"
                      possible_values=".true. for slowly time-varying deep soil temperatures; .false. otherwise"/>
 
-                <nml_option name="config_o3climatology" type="logical" default_value="false" in_defaults="false"
+                <nml_option name="config_o3climatology" type="logical" default_value="true" in_defaults="false"
                      units="-"
                      description="logical for configuration of input ozone data in RRMTG long- and short-wave radiation"
                      possible_values=".true. for using monthly-varying ozone data; .false. for using fixed vertical profile"/>

src/core_atmosphere/dynamics/mpas_atm_time_integration.F

@@ -62,7 +62,7 @@ module atm_time_integration
    contains
 
 
-   subroutine atm_timestep(domain, dt, timeStamp, itimestep)
+   subroutine atm_timestep(domain, dt, nowTime, itimestep)
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
    ! Advance model state forward in time by the specified time step
    !
@@ -76,7 +76,7 @@ subroutine atm_timestep(domain, dt, timeStamp, itimestep)
 
       type (domain_type), intent(inout) :: domain
       real (kind=RKIND), intent(in) :: dt
-      character(len=*), intent(in) :: timeStamp
+      type (MPAS_Time_type), intent(in) :: nowTime
       integer, intent(in) :: itimestep
 
 
@@ -98,9 +98,8 @@ subroutine atm_timestep(domain, dt, timeStamp, itimestep)
          call mpas_log_write('Currently, only ''SRK3'' is supported.', messageType=MPAS_LOG_CRIT)
       end if
 
-      call mpas_set_time(currTime, dateTimeString=timeStamp)
       call mpas_set_timeInterval(dtInterval, dt=dt)
-      currTime = currTime + dtInterval
+      currTime = nowTime + dtInterval
       call mpas_get_time(currTime, dateTimeString=xtime_new)
 
       block => domain % blocklist

src/core_atmosphere/mpas_atm_core.F

@@ -36,7 +36,6 @@ function atm_core_init(domain, startTimeStamp) result(ierr)
       real (kind=RKIND), pointer :: dt
       type (block_type), pointer :: block
 
-      character(len=StrKIND) :: timeStamp
       integer :: i
       logical, pointer :: config_do_restart
 
@@ -846,7 +845,6 @@ subroutine atm_do_timestep(domain, dt, itimestep)
 
       type (MPAS_Time_Type) :: startTime, currTime
       type (MPAS_TimeInterval_Type) :: xtimeTime
-      character(len=StrKIND) :: timeStamp
       integer :: s, s_n, s_d
       real (kind=RKIND) :: xtime_s
       integer :: ierr
@@ -858,8 +856,6 @@ subroutine atm_do_timestep(domain, dt, itimestep)
       call mpas_get_timeInterval(interval=xtimeTime, S=s, S_n=s_n, S_d=s_d, ierr=ierr)         
       xtime_s = (s + s_n / s_d)
 
-      call mpas_get_time(curr_time=currTime, dateTimeString=timeStamp, ierr=ierr)         
-
 
 #ifdef DO_PHYSICS
       !proceed with physics if moist_physics is set to true:
@@ -869,7 +865,7 @@ subroutine atm_do_timestep(domain, dt, itimestep)
       endif
 #endif
 
-      call atm_timestep(domain, dt, timeStamp, itimestep)
+      call atm_timestep(domain, dt, currTime, itimestep)
 
    end subroutine atm_do_timestep
 

src/core_init_atmosphere/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="init_atmosphere" core_abbrev="init_atm" version="6.2">
+<registry model="mpas" core="init_atmosphere" core_abbrev="init_atm" version="6.3">
 
 <!-- **************************************************************************************** -->
 <!-- ************************************** Dimensions ************************************** -->

src/core_landice/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="landice" core_abbrev="li" version="6.2">
+<registry model="mpas" core="landice" core_abbrev="li" version="6.3">
 
 
 <!-- ======================================================================= -->

src/core_ocean/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="ocean" core_abbrev="ocn" version="6.2">
+<registry model="mpas" core="ocean" core_abbrev="ocn" version="6.3">
 
 	<dims>
 		<dim name="nCells" units="unitless"

src/core_seaice/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="seaice" core_abbrev="seaice" version="6.2">
+<registry model="mpas" core="seaice" core_abbrev="seaice" version="6.3">
 
 	<dims>
 		<dim name="nCells"

src/core_sw/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="sw" core_abbrev="sw" version="6.2">
+<registry model="mpas" core="sw" core_abbrev="sw" version="6.3">
 	<dims>
 		<dim name="nCells"/>
 		<dim name="nEdges"/>

src/core_test/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="test" core_abbrev="test" version="6.2">
+<registry model="mpas" core="test" core_abbrev="test" version="6.3">
 	<dims>
 		<dim name="nCells"/>
 		<dim name="nEdges"/>