[Dart-dev] [9441] DART/trunk: Committing the merge properties from reintegrating the ROMS branch

nancy at ucar.edu nancy at ucar.edu
Wed Jan 6 15:45:59 MST 2016 

Revision: 9441
Author:   thoar
Date:     2016-01-06 15:45:59 -0700 (Wed, 06 Jan 2016)
Log Message:
-----------
Committing the merge properties from reintegrating the ROMS branch
onto the trunk.  The index.html actually had meaningful changes, so
I fixed the conflict and am committing it.

Modified Paths:
--------------
    DART/trunk/index.html

Property Changed:
----------------
    DART/trunk/assim_tools/assim_tools_mod.f90
    DART/trunk/matlab/GetClmInfo.m
    DART/trunk/models/bgrid_solo/model_mod.f90
    DART/trunk/models/cam/shell_scripts/CESM_DART_config
    DART/trunk/models/cam/shell_scripts/assimilate.csh
    DART/trunk/models/cam/shell_scripts/perfect_model.csh
    DART/trunk/models/wrf/model_mod.f90
    DART/trunk/obs_kind/DEFAULT_obs_kind_mod.F90
    DART/trunk/observations/NCEP/ascii_to_obs/real_obs_mod.f90
    DART/trunk/utilities/closest_member_tool.f90

-------------- next part --------------

Property changes on: DART/trunk/assim_tools/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam/assim_tools/assim_tools_mod.f90:6639-7729
/DART/branches/development/assim_tools/assim_tools_mod.f90:4680-6255
/DART/branches/gitm_lanai/assim_tools/assim_tools_mod.f90:6571-6652
/DART/branches/helen/assim_tools/assim_tools_mod.f90:5995-6161
/DART/releases/Kodiak/assim_tools/assim_tools_mod.f90:5020-5583
   + /DART/branches/ROMS/assim_tools/assim_tools_mod.f90:5084-9438
/DART/branches/cam/assim_tools/assim_tools_mod.f90:6639-7729
/DART/branches/development/assim_tools/assim_tools_mod.f90:4680-6255
/DART/branches/gitm/assim_tools/assim_tools_mod.f90:5143-6215
/DART/branches/gitm_lanai/assim_tools/assim_tools_mod.f90:6571-6652
/DART/branches/helen/assim_tools/assim_tools_mod.f90:5995-6161
/DART/releases/Kodiak/assim_tools/assim_tools_mod.f90:5020-5583

Modified: DART/trunk/index.html
===================================================================
--- DART/trunk/index.html	2016-01-06 22:36:39 UTC (rev 9440)
+++ DART/trunk/index.html	2016-01-06 22:45:59 UTC (rev 9441)
@@ -274,6 +274,8 @@
 <LI>noah <A href="models/noah/noah_to_dart.html">noah_to_dart</A></LI>
 <LI>POP <A href="models/POP/dart_to_pop.html">dart_to_pop</A></LI>
 <LI>POP <A href="models/POP/pop_to_dart.html">pop_to_dart</A></LI>
+<LI>ROMS <A href="models/ROMS/dart_to_roms.html">dart_to_roms</A></LI>
+<LI>ROMS <A href="models/ROMS/roms_to_dart.html">roms_to_dart</A></LI>
 <LI>wrf <A href="models/wrf/shell_scripts/advance_model.html">advance_model</A></LI>
 <LI>wrf <A href="models/wrf/WRF_DART_utilities/dart_to_wrf.html">dart_to_wrf</A></LI>
 <LI>wrf <A href="models/wrf/WRF_DART_utilities/dart_to_wrf.html">wrf_to_dart</A></LI>
@@ -333,6 +335,7 @@
 <LI><A HREF="models/null_model/model_mod.html">null_model</A> (html)</LI>
 <LI><A HREF="models/pe2lyr/model_mod.html">pe2lyr</A> (html)</LI>
 <LI><A HREF="models/POP/model_mod.html">POP</A> (html)</LI>
+<LI><A HREF="models/ROMS/model_mod.html">ROMS</A> (html)</LI>
 <LI><A HREF="models/rose/model_mod.f90">Rose</A> (source)</LI>
 <LI><A HREF="models/simple_advection/model_mod.html">simple_advection</A> (html)</LI>
 <LI><A HREF="models/sqg/model_mod.html">SQG</A> (html)</LI>
@@ -464,6 +467,9 @@
 <LI>POP <A HREF="models/POP/dart_to_pop.nml#Namelist">&amp;dart_to_pop_nml</A></LI>
 <LI>POP <A HREF="models/POP/model_mod.nml#Namelist">&amp;model_nml</A></LI>
 <LI>POP <A HREF="models/POP/pop_to_dart.nml#Namelist">&amp;pop_to_dart_nml</A></LI>
+<LI>ROMS <A HREF="models/ROMS/dart_to_roms.nml#Namelist">&amp;dart_to_roms</A></LI>
+<LI>ROMS <A HREF="models/ROMS/model_mod.nml#Namelist">&amp;model_nml</A></LI>
+<LI>ROMS <A HREF="models/ROMS/roms_to_dart.nml#Namelist">&amp;roms_to_dart_nml</A></LI>
 <LI>simple_advection <A HREF="models/simple_advection/model_mod.nml#Namelist">&amp;model_nml</A></LI>
 <LI>sqg <A HREF="models/sqg/model_mod.nml#Namelist">&amp;model_nml</A></LI>
 <LI>template <A HREF="models/template/model_mod.nml#Namelist">&amp;model_nml</A></LI>
@@ -601,11 +607,18 @@
 <LI><A href="models/NCOMMAS/model_mod.f90">models/NCOMMAS/model_mod</A> (source)</LI>
 <LI><A href="models/NCOMMAS/model_mod.html">models/NCOMMAS/model_mod</A> (html)</LI>
 <LI><A href="models/NCOMMAS/ncommas_to_dart.html">models/NCOMMAS/ncommas_to_dart</A></LI>
+
 <LI><A href="models/POP/dart_pop_mod.html">models/POP/dart_pop_mod</A> (html)</LI>
 <LI><A href="models/POP/dart_to_pop.html">models/POP/dart_to_pop</A></LI>
 <LI><A href="models/POP/model_mod.f90">models/POP/model_mod</A> (source)</LI>
 <LI><A href="models/POP/model_mod.html">models/POP/model_mod</A> (html)</LI>
 <LI><A href="models/POP/pop_to_dart.html">models/POP/pop_to_dart</A></LI>
+
+<LI><A href="models/ROMS/dart_to_roms.html">models/ROMS/dart_to_roms</A></LI>
+<LI><A href="models/ROMS/model_mod.f90">models/ROMS/model_mod</A> (source)</LI>
+<LI><A href="models/ROMS/model_mod.html">models/ROMS/model_mod</A> (html)</LI>
+<LI><A href="models/ROMS/roms_to_dart.html">models/ROMS/roms_to_dart</A></LI>
+
 <LI><A href="models/am2/model_mod.f90">models/am2/model_mod</A> (source)</LI>
 <LI><A href="models/bgrid_solo/model_mod.f90">models/bgrid_solo/model_mod</A> (source)</LI>
 <LI><A href="models/cam/cam_to_dart.html">models/cam/cam_to_dart</A></LI>


Property changes on: DART/trunk/matlab/GetClmInfo.m
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam/matlab/GetClmInfo.m:6639-7729
/DART/branches/development/matlab/GetClmInfo.m:4680-5731
/DART/branches/gitm_lanai/matlab/GetClmInfo.m:6571-6652
/DART/branches/helen/matlab/GetClmInfo.m:5995-6161
   + /DART/branches/ROMS/matlab/GetClmInfo.m:7093-9438
/DART/branches/cam/matlab/GetClmInfo.m:6639-7729
/DART/branches/development/matlab/GetClmInfo.m:4680-5731
/DART/branches/gitm_lanai/matlab/GetClmInfo.m:6571-6652
/DART/branches/helen/matlab/GetClmInfo.m:5995-6161


Property changes on: DART/trunk/models/bgrid_solo/model_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam/models/bgrid_solo/model_mod.f90:6639-7729
/DART/branches/development/models/bgrid_solo/model_mod.f90:4680-6255
/DART/branches/gitm_lanai/models/bgrid_solo/model_mod.f90:6571-6652
/DART/branches/helen/models/bgrid_solo/model_mod.f90:5995-6161
   + /DART/branches/ROMS/models/bgrid_solo/model_mod.f90:5084-9438
/DART/branches/cam/models/bgrid_solo/model_mod.f90:6639-7729
/DART/branches/development/models/bgrid_solo/model_mod.f90:4680-6255
/DART/branches/gitm/models/bgrid_solo/model_mod.f90:5143-6215
/DART/branches/gitm_lanai/models/bgrid_solo/model_mod.f90:6571-6652
/DART/branches/helen/models/bgrid_solo/model_mod.f90:5995-6161


Property changes on: DART/trunk/models/cam/shell_scripts/CESM_DART_config
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam/models/cam/shell_scripts/CESM_DART_config:6638-7732
/DART/branches/cam-update/shell_scripts/CESM_DART_config:4903-4923
/DART/branches/development/models/cam/shell_scripts/CESM_DART_config:4680-6255
/DART/branches/gitm/models/cam/shell_scripts/CESM_DART_config:5143-6215
/DART/branches/gitm_lanai/models/cam/shell_scripts/CESM_DART_config:6571-6652
/DART/branches/helen/models/cam/shell_scripts/CESM_DART_config:5995-6161
   + /DART/branches/ROMS/models/cam/shell_scripts/CESM_DART_config:7093-9438
/DART/branches/cam/models/cam/shell_scripts/CESM_DART_config:6638-7732
/DART/branches/cam-update/shell_scripts/CESM_DART_config:4903-4923
/DART/branches/development/models/cam/shell_scripts/CESM_DART_config:4680-6255
/DART/branches/gitm/models/cam/shell_scripts/CESM_DART_config:5143-6215
/DART/branches/gitm_lanai/models/cam/shell_scripts/CESM_DART_config:6571-6652
/DART/branches/helen/models/cam/shell_scripts/CESM_DART_config:5995-6161
/DART/trunk/models/cam/shell_scripts/CESM_DART_config:5084-6528


Property changes on: DART/trunk/models/cam/shell_scripts/assimilate.csh
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam/models/cam/shell_scripts/assimilate.csh:6638-7732
/DART/branches/cam-update/shell_scripts/assimilate.csh:4903-4923
/DART/branches/development/models/cam/shell_scripts/assimilate.csh:4680-6255
/DART/branches/gitm/models/cam/shell_scripts/assimilate.csh:5143-6215
/DART/branches/gitm_lanai/models/cam/shell_scripts/assimilate.csh:6571-6652
/DART/branches/helen/models/cam/shell_scripts/assimilate.csh:5995-6161
   + /DART/branches/ROMS/models/cam/shell_scripts/assimilate.csh:7093-9438
/DART/branches/cam/models/cam/shell_scripts/assimilate.csh:6638-7732
/DART/branches/cam-update/shell_scripts/assimilate.csh:4903-4923
/DART/branches/development/models/cam/shell_scripts/assimilate.csh:4680-6255
/DART/branches/gitm/models/cam/shell_scripts/assimilate.csh:5143-6215
/DART/branches/gitm_lanai/models/cam/shell_scripts/assimilate.csh:6571-6652
/DART/branches/helen/models/cam/shell_scripts/assimilate.csh:5995-6161
/DART/trunk/models/cam/shell_scripts/assimilate.csh:5084-6255


Property changes on: DART/trunk/models/cam/shell_scripts/perfect_model.csh
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam/models/cam/shell_scripts/perfect_model.csh:6638-7732
/DART/branches/cam-update/shell_scripts/perfect_model.csh:4903-4923
/DART/branches/development/models/cam/shell_scripts/perfect_model.csh:4680-6255
/DART/branches/gitm/models/cam/shell_scripts/perfect_model.csh:5143-6215
/DART/branches/gitm_lanai/models/cam/shell_scripts/perfect_model.csh:6571-6652
/DART/branches/helen/models/cam/shell_scripts/perfect_model.csh:5995-6161
   + /DART/branches/ROMS/models/cam/shell_scripts/perfect_model.csh:7093-9438
/DART/branches/cam/models/cam/shell_scripts/perfect_model.csh:6638-7732
/DART/branches/cam-update/shell_scripts/perfect_model.csh:4903-4923
/DART/branches/development/models/cam/shell_scripts/perfect_model.csh:4680-6255
/DART/branches/gitm/models/cam/shell_scripts/perfect_model.csh:5143-6215
/DART/branches/gitm_lanai/models/cam/shell_scripts/perfect_model.csh:6571-6652
/DART/branches/helen/models/cam/shell_scripts/perfect_model.csh:5995-6161
/DART/trunk/models/cam/shell_scripts/perfect_model.csh:5084-6538


Property changes on: DART/trunk/models/wrf/model_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam/models/wrf/model_mod.f90:6639-7729
/DART/branches/development/models/wrf/model_mod.f90:4680-6255
/DART/branches/gitm/models/wrf/model_mod.f90:5143-6215
/DART/branches/gitm_lanai/models/wrf/model_mod.f90:6571-6652
/DART/branches/helen/models/wrf/model_mod.f90:5995-6161
/DART/releases/Kodiak/models/wrf/model_mod.f90:5020-5772
   + /DART/branches/ROMS/models/wrf/model_mod.f90:5084-9438
/DART/branches/cam/models/wrf/model_mod.f90:6639-7729
/DART/branches/development/models/wrf/model_mod.f90:4680-6255
/DART/branches/gitm/models/wrf/model_mod.f90:5143-6215
/DART/branches/gitm_lanai/models/wrf/model_mod.f90:6571-6652
/DART/branches/helen/models/wrf/model_mod.f90:5995-6161
/DART/releases/Kodiak/models/wrf/model_mod.f90:5020-5772


Property changes on: DART/trunk/obs_kind/DEFAULT_obs_kind_mod.F90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam/obs_kind/DEFAULT_obs_kind_mod.F90:6639-7729
/DART/branches/development/obs_kind/DEFAULT_obs_kind_mod.F90:4680-6255
/DART/branches/gitm/obs_kind/DEFAULT_obs_kind_mod.F90:5143-6215
/DART/branches/gitm_lanai/obs_kind/DEFAULT_obs_kind_mod.F90:6571-6652
/DART/branches/helen/obs_kind/DEFAULT_obs_kind_mod.F90:5995-6161
/DART/branches/mpas/obs_kind/DEFAULT_obs_kind_mod.F90:5183-5672
/DART/releases/Kodiak/obs_kind/DEFAULT_obs_kind_mod.F90:5020-5663
   + /DART/branches/ROMS/obs_kind/DEFAULT_obs_kind_mod.F90:5084-9438
/DART/branches/cam/obs_kind/DEFAULT_obs_kind_mod.F90:6639-7729
/DART/branches/development/obs_kind/DEFAULT_obs_kind_mod.F90:4680-6255
/DART/branches/gitm/obs_kind/DEFAULT_obs_kind_mod.F90:5143-6215
/DART/branches/gitm_lanai/obs_kind/DEFAULT_obs_kind_mod.F90:6571-6652
/DART/branches/helen/obs_kind/DEFAULT_obs_kind_mod.F90:5995-6161
/DART/branches/mpas/obs_kind/DEFAULT_obs_kind_mod.F90:5183-5672
/DART/releases/Kodiak/obs_kind/DEFAULT_obs_kind_mod.F90:5020-5663


Property changes on: DART/trunk/observations/NCEP/ascii_to_obs/real_obs_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam/observations/NCEP/ascii_to_obs/real_obs_mod.f90:6639-7729
/DART/branches/development/observations/NCEP/ascii_to_obs/real_obs_mod.f90:4680-6255
/DART/branches/gitm_lanai/observations/NCEP/ascii_to_obs/real_obs_mod.f90:6571-6652
/DART/branches/helen/observations/NCEP/ascii_to_obs/real_obs_mod.f90:5995-6161
   + /DART/branches/ROMS/observations/NCEP/ascii_to_obs/real_obs_mod.f90:5084-9438
/DART/branches/cam/observations/NCEP/ascii_to_obs/real_obs_mod.f90:6639-7729
/DART/branches/development/observations/NCEP/ascii_to_obs/real_obs_mod.f90:4680-6255
/DART/branches/gitm/observations/NCEP/ascii_to_obs/real_obs_mod.f90:5143-6215
/DART/branches/gitm_lanai/observations/NCEP/ascii_to_obs/real_obs_mod.f90:6571-6652
/DART/branches/helen/observations/NCEP/ascii_to_obs/real_obs_mod.f90:5995-6161


Property changes on: DART/trunk/utilities/closest_member_tool.f90
___________________________________________________________________
Modified: svn:mergeinfo
   - /DART/branches/cam/utilities/closest_member_tool.f90:6639-7729
/DART/branches/close/closest_member_tool.f90:4780
/DART/branches/development/utilities/closest_member_tool.f90:4680-6255
/DART/branches/gitm_lanai/utilities/closest_member_tool.f90:6571-6652
/DART/branches/helen/utilities/closest_member_tool.f90:5995-6161
/DART/releases/Kodiak/utilities/closest_member_tool.f90:5020-5693
   + /DART/branches/ROMS/utilities/closest_member_tool.f90:5084-9438
/DART/branches/cam/utilities/closest_member_tool.f90:6639-7729
/DART/branches/close/closest_member_tool.f90:4780
/DART/branches/development/utilities/closest_member_tool.f90:4680-6255
/DART/branches/gitm/utilities/closest_member_tool.f90:5143-6215
/DART/branches/gitm_lanai/utilities/closest_member_tool.f90:6571-6652
/DART/branches/helen/utilities/closest_member_tool.f90:5995-6161
/DART/releases/Kodiak/utilities/closest_member_tool.f90:5020-5693

More information about the Dart-dev mailing list