[Dart-dev] DART/branches Revision: 12846

[dart at ucar.edu]

thoar at ucar.edu
2018-09-24 15:25:18 -0600 (Mon, 24 Sep 2018)
145
This is exactly what Romain had when he reverted to the classic version
because he was having problems with the interpolation (or so we think).




Modified: DART/branches/roms_interpolation/assimilation_code/modules/io/state_structure_mod.f90
===================================================================
--- DART/branches/roms_interpolation/assimilation_code/modules/io/state_structure_mod.f90	2018-09-24 21:20:25 UTC (rev 12845)
+++ DART/branches/roms_interpolation/assimilation_code/modules/io/state_structure_mod.f90	2018-09-24 21:25:18 UTC (rev 12846)
@@ -923,7 +923,7 @@
 
 
 !-------------------------------------------------------------------------------
-!> Return and array containing the dimension lengths, excluding the UNLIMITED dim
+!> Return an array containing the dimension lengths, excluding the UNLIMITED dim
 
 
 function get_dim_lengths(dom_id, ivar)

Modified: DART/branches/roms_interpolation/assimilation_code/modules/utilities/mpi_utilities_mod.f90
===================================================================
--- DART/branches/roms_interpolation/assimilation_code/modules/utilities/mpi_utilities_mod.f90	2018-09-24 21:20:25 UTC (rev 12845)
+++ DART/branches/roms_interpolation/assimilation_code/modules/utilities/mpi_utilities_mod.f90	2018-09-24 21:25:18 UTC (rev 12846)
@@ -72,16 +72,16 @@
 ! this directory.  It is a sed script that comments in and out the interface
 ! block below.  Please leave the BLOCK comment lines unchanged.
 
-! !!SYSTEM_BLOCK_EDIT START COMMENTED_OUT
-! ! interface block for getting return code back from system() routine
-! interface
-!  function system(string)
-!   character(len=*) :: string
-!   integer :: system
-!  end function system
-! end interface
-! ! end block
-! !!SYSTEM_BLOCK_EDIT END COMMENTED_OUT
+ !!SYSTEM_BLOCK_EDIT START COMMENTED_IN
+ ! interface block for getting return code back from system() routine
+ interface
+  function system(string)
+   character(len=*) :: string
+   integer :: system
+  end function system
+ end interface
+ ! end block
+ !!SYSTEM_BLOCK_EDIT END COMMENTED_IN
 
 
 ! allow global sum to be computed for integers, r4, and r8s

Modified: DART/branches/roms_interpolation/assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
===================================================================
--- DART/branches/roms_interpolation/assimilation_code/modules/utilities/null_mpi_utilities_mod.f90	2018-09-24 21:20:25 UTC (rev 12845)
+++ DART/branches/roms_interpolation/assimilation_code/modules/utilities/null_mpi_utilities_mod.f90	2018-09-24 21:25:18 UTC (rev 12846)
@@ -46,16 +46,16 @@
 ! this directory.  It is a sed script that comments in and out the interface
 ! block below.  Please leave the BLOCK comment lines unchanged.
 
-! !!SYSTEM_BLOCK_EDIT START COMMENTED_OUT
-! ! interface block for getting return code back from system() routine
-! interface
-!  function system(string)    
-!   character(len=*) :: string
-!   integer :: system         
-!  end function system
-! end interface
-! ! end block                 
-! !!SYSTEM_BLOCK_EDIT END COMMENTED_OUT
+ !!SYSTEM_BLOCK_EDIT START COMMENTED_IN
+ ! interface block for getting return code back from system() routine
+ interface
+  function system(string)    
+   character(len=*) :: string
+   integer :: system         
+  end function system
+ end interface
+ ! end block                 
+ !!SYSTEM_BLOCK_EDIT END COMMENTED_IN
 
 
 interface sum_across_tasks

Modified: DART/branches/roms_interpolation/models/ROMS/model_mod.f90
===================================================================
--- DART/branches/roms_interpolation/models/ROMS/model_mod.f90	2018-09-24 21:20:25 UTC (rev 12845)
+++ DART/branches/roms_interpolation/models/ROMS/model_mod.f90	2018-09-24 21:25:18 UTC (rev 12846)
@@ -47,7 +47,7 @@
                              write_location, set_location_missing,              &
                              get_close_obs, get_close_state,                    &
                              convert_vertical_obs, convert_vertical_state,      &
-                             VERTISHEIGHT, VERTISSURFACE
+                             VERTISHEIGHT, VERTISSURFACE, is_vertical
 
 use    utilities_mod, only : register_module, error_handler, do_nml_term,       &
                              E_ERR, E_WARN, E_MSG, logfileunit, get_unit,       &
@@ -64,7 +64,7 @@
                              QTY_SEA_SURFACE_HEIGHT,    &
                              QTY_SEA_SURFACE_PRESSURE,  &
                              QTY_POTENTIAL_TEMPERATURE, &
-                             get_index_for_quantity,     &
+                             get_index_for_quantity,    &
                              get_name_for_quantity
 
 use     mpi_utilities_mod, only : my_task_id
@@ -89,12 +89,18 @@