[Dart-dev] DART/branches Revision: 12272

dart at ucar.edu dart at ucar.edu
Wed Jan 3 16:36:17 MST 2018


thoar at ucar.edu
2018-01-03 16:36:15 -0700 (Wed, 03 Jan 2018)
2877
Reintegrating branches/mmc 

Several model_mod_check programs were combined into a single
assimilation_code/programs/model_mod_check/model_mod_check.f90
that allows for selection of individual tests.

The path_names and mkmf files have been updated. The namelists have
been updated - and some models have had the model_mod_check_nml namelist
removed because they did not build model_mod_check.

Removed the lorenz_96 filter_ics.nnnn.nc because we don't support that usage pattern.

several small-scale bugfixes and cleanup - listed here: 

assimilation_code/location/threed_sphere/location_mod.f90
        print format wider for fractional levels

assimilation_code/modules/assimilation/assim_model_mod.html
        removed two routines, fixed documentation for
        get_closest_state_time_to
        get_initial_condition

assimilation_code/modules/io/dart_time_io_mod.f90
        fixed variable type for 'time' variables we create.

assimilation_code/modules/io/direct_netcdf_mod.f90
        only task 0 deallocates the arrays that task 0 allocates

assimilation_code/modules/io/state_structure_mod.f90
        adding derived type component that allows reporting
        original file dimension IDs and lengths for the file.

assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
        clearer reporting of observations assimilated/evaluated/precomputed

assimilation_code/modules/utilities/cray_win_mod.f90
assimilation_code/modules/utilities/no_cray_win_mod.f90
assimilation_code/modules/utilities/null_win_mod.f90
        make observation ensemble handles optional in free_state_window()
        so windows can be used when there is only an ensemble of states
assimilation_code/programs/perfect_model_obs/perfect_model_obs.f90

models/cam-fv/model_mod.f90
        bug fix for calculating the U_WIND observations on height.
        U_WIND observations usually use pressure for the vertical.

models/cam-fv/work/input.nml
        providing a default highest_obs_pressure_Pa that works with default
        cam model_version

models/model_mod_tools/test_interpolate_threed_cartesian.f90
        fixed grid creation in test_interpolate_range(). Now uses
        correct spacing for grids in the x,y coordinates.
models/model_mod_tools/test_interpolate*90
        allocate and initialize the array of error codes


Removed model_mod_check namelist blocks from input.nml files that
        did not build model_mod_check.

Added a new model_check_utilities_mod.f90 to all path_names_model_mod_check that
contains routines common to all versions of model_mod_check.
Updated all input.nml:model_mod_check_nml namelists to be consistent with
the applicable model_mod_check program.


models/clm/model_mod.f90
        the DART QTYs are now available via the state structure.

models/wrf/model_mod.f90
        the DART QTYs are now available via the state structure.





Index: DART/branches/rma_trunk
===================================================================
--- DART/branches/rma_trunk	2018-01-03 22:57:09 UTC (rev 12271)
+++ DART/branches/rma_trunk	2018-01-03 23:36:15 UTC (rev 12272)

Property changes on: DART/branches/rma_trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -5,6 +5,7 ##
 /DART/branches/gitm:5137-6209
 /DART/branches/gitm_lanai:6565-6646
 /DART/branches/helen:5989-6155
+/DART/branches/mmc:12038-12269
 /DART/branches/model_mod_changes:11403-11604
 /DART/branches/rma_array_nml:11814-11839
 /DART/branches/rma_cam_fv:9552-9728
Modified: DART/branches/rma_trunk/CHANGELOG
===================================================================
--- DART/branches/rma_trunk/CHANGELOG	2018-01-03 22:57:09 UTC (rev 12271)
+++ DART/branches/rma_trunk/CHANGELOG	2018-01-03 23:36:15 UTC (rev 12272)
@@ -613,13 +613,64 @@
 longitude interpolation in grids that cross the 360/0 line.
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ MMM DD YYYY :: summary of next changes                    $Revision$
++ Jan 03 2018 :: MPAS_ATM bugfix                             Revision: 12256
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 - Fixed an error in the mpas_atm model_mod for a debug print that failed with
 large ensemble sizes.
 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ Jan 03 2018 :: reintegration of mmc branch                $Revision$
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+- several model_mod_check programs were combined into a single 
+  assimilation_code/programs/model_mod_check/model_mod_check.f90
+  that allows for selection of individual tests.
+
+- bugfix: threed_sphere/location_mod.f90 
+          print format wider for fractional levels
+
+- bugfix: dart_time_io_mod.f90 
+          fixed variable type for 'time' variables we create.
+
+- bugfix: direct_netcdf_mod.f90 
+          only task 0 deallocates the arrays that task 0 allocates
+
+- bugfix: cam-fv/model_mod.f90 calculating the U_WIND observations on height.
+          indexing was wrong in a block of code that is seldom (if ever) used.
+          U_WIND observations usually use pressure for the vertical.
+
+- bugfix: test_interpolate_threed_cartesian.f90 fixed grid creation in 
+          test_interpolate_range(). Now uses correct spacing for grids 
+          in the x,y coordinates.
+
+- bugfix: model_mod_tools/test_interpolate*90  ensure that all versions
+          allocate and initialize the array of error codes
+
+- feature: utilities/*_win_mod.f90: free_state_window()
+           make observation ensemble handles optional
+
+- feature: clm/model_mod.f90 
+           the DART QTYs are now available via the state structure
+
+- feature: wrf/model_mod.f90 
+           the DART QTYs are now available via the state structure
+
+- cleanup: the PGI compiler warns against variables that have the same
+           name as Fortran intrinsics. _some_ of those have been renamed.
+
+- cleanup: some unused variables were removed in modules that were involved.
+
+- cleanup: assim_model_mod.html 
+           removed two unused routines, fixed documentation for 
+           get_closest_state_time_to and get_initial_condition
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ MMM DD YYYY :: summary of next changes                    $Revision$
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+- next ...
+
 # <next few lines under version control, do not edit>
 # $URL$
 # $Revision$

Modified: DART/branches/rma_trunk/assimilation_code/location/threed_sphere/location_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/location/threed_sphere/location_mod.f90	2018-01-03 22:57:09 UTC (rev 12271)
+++ DART/branches/rma_trunk/assimilation_code/location/threed_sphere/location_mod.f90	2018-01-03 23:36:15 UTC (rev 12272)
@@ -815,7 +815,7 @@
    case (VERTISSURFACE)
       write(charstring, '(A,F13.5,A)') trim(string1), loc%vloc, ' surface (m)'
    case (VERTISLEVEL)
-      write(charstring, '(A,F6.0,A)')  trim(string1), loc%vloc, '        level'
+      write(charstring, '(A,F13.6,A)') trim(string1), loc%vloc, '  level'
    case (VERTISPRESSURE)
       write(charstring, '(A,F13.7,A)') trim(string1), loc%vloc / 100.0_r8, ' hPa'
    case (VERTISHEIGHT)
@@ -1155,7 +1155,7 @@


More information about the Dart-dev mailing list