[Dart-dev] DART/branches Revision: 10936

[dart at ucar.edu]

thoar at ucar.edu
2017-01-23 13:10:00 -0700 (Mon, 23 Jan 2017)
520
Finishing the merge-from-trunk.
This version will not bitwise reproduce the output prior inflation file
because of intentional numeric changes to assim_tools_mod.f90.
They are roundoff-level errors for 64bit reals - nothing to worry about.

There are a couple more obs_kind's specified, so the numbering of the
observation headers in the obs_sequence_files are different as well, 
but the data values are identical. This is a known and acceptable change.

The mizzi branch is now consistent with the head of the trunk.




Index: DART/branches/mizzi
===================================================================
--- DART/branches/mizzi	2017-01-23 18:05:43 UTC (rev 10935)
+++ DART/branches/mizzi	2017-01-23 20:10:00 UTC (rev 10936)

Property changes on: DART/branches/mizzi
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,7 ##
+/DART/branches/NOGAPS:6328-10846
 /DART/branches/development:5955-6255
 /DART/branches/gitm:5143-6215
 /DART/branches/gitm_lanai:6571-6652
 /DART/branches/helen:5995-6161
-/DART/trunk:4680-7370
\ No newline at end of property
+/DART/branches/trunk_with_cam_style:9473-9540
+/DART/trunk:4680-10928
\ No newline at end of property
Modified: DART/branches/mizzi/assim_model/assim_model_mod.f90
===================================================================
--- DART/branches/mizzi/assim_model/assim_model_mod.f90	2017-01-23 18:05:43 UTC (rev 10935)
+++ DART/branches/mizzi/assim_model/assim_model_mod.f90	2017-01-23 20:10:00 UTC (rev 10936)
@@ -21,7 +21,7 @@
                           dump_unit_attributes, find_namelist_in_file,             &
                           check_namelist_read, nc_check, do_nml_file, do_nml_term, &
                           find_textfile_dims, file_to_text, set_output,            &
-                          ascii_file_format, set_output
+                          ascii_file_format, set_output, file_exist, open_file, close_file
 use     model_mod, only : get_model_size, static_init_model, get_state_meta_data,  &
                           get_model_time_step, model_interpolate, init_conditions, &
                           init_time, adv_1step, end_model, nc_write_model_atts,    &
@@ -85,14 +85,14 @@
 logical :: module_initialized = .false.
 
 ! Global storage for default restart formats
-character(len = 16) :: read_format = "unformatted", write_format = "unformatted"
+character(len=16) :: read_format = "unformatted", write_format = "unformatted"
 
 ! Global storage for error string output
-character(len = 129)  :: msgstring
+character(len=512)  :: msgstring
 
 !-------------------------------------------------------------
 ! Namelist with default values
-! write_binary_restart_files  == .true.  -> use unformatted file format. 
+! write_binary_restart_files  == .true.  -> use unformatted file format.
 !                                     Full precision, faster, smaller,
 !                                     but not as portable.
 
@@ -113,7 +113,7 @@
 !
 ! Allocates storage for an instance of an assim_model_type. With this
 ! implementation, need to be VERY careful about assigment and maintaining
-! permanent storage locations. Need to revisit the best way to do 
+! permanent storage locations. Need to revisit the best way to do
 ! assim_model_copy below.
 
 implicit none
@@ -136,7 +136,7 @@
 ! subroutine static_init_assim_model()
 !
 ! Initializes class data for the assim_model. Also calls the static
-! initialization for the underlying model. So far, this simply 
+! initialization for the underlying model. So far, this simply
 ! is initializing the position of the state variables as location types.
 
 implicit none
@@ -146,7 +146,7 @@
 ! only execute this code once, even if called multiple times.
 if (module_initialized) return
 
-! First thing to do is echo info to logfile ... 
+! First thing to do is echo info to logfile ...
 call register_module(source, revision, revdate)
 module_initialized = .true.
 
@@ -155,7 +155,7 @@
 read(iunit, nml = assim_model_nml, iostat = io)
 call check_namelist_read(iunit, io, "assim_model_nml")
 
-! Record the namelist values used for the run ... 
+! Record the namelist values used for the run ...
 if (do_nml_file()) write(nmlfileunit, nml=assim_model_nml)
 if (do_nml_term()) write(     *     , nml=assim_model_nml)
 
@@ -186,16 +186,16 @@
 !    NF90_put_var       ! provide values for variable
 ! NF90_CLOSE            ! close: save updated netCDF dataset
 !
-! Time is a funny beast ... 
+! Time is a funny beast ...
 ! Many packages decode the time:units attribute to convert the offset to a calendar
 ! date/time format. Using an offset simplifies many operations, but is not the
 ! way we like to see stuff plotted. The "approved" calendars are:
-! gregorian or standard 
-!      Mixed Gregorian/Julian calendar as defined by Udunits. This is the default. 
-!  noleap   Modern calendar without leap years, i.e., all years are 365 days long. 
-!  360_day  All years are 360 days divided into 30 day months. 
-!  julian   Julian calendar. 
-!  none     No calendar.