[Dart-dev] DART/branches Revision: 12612

[dart at ucar.edu]

thoar at ucar.edu
2018-05-31 16:43:15 -0600 (Thu, 31 May 2018)
48
This is a bad commit to demonstrate conflicts.




Modified: DART/branches/gigg/models/lorenz_96/work/input.nml
===================================================================
--- DART/branches/gigg/models/lorenz_96/work/input.nml	2018-05-31 20:55:33 UTC (rev 12611)
+++ DART/branches/gigg/models/lorenz_96/work/input.nml	2018-05-31 22:43:15 UTC (rev 12612)
@@ -62,7 +62,7 @@
    last_obs_days                = -1,
    last_obs_seconds             = -1,
 
-   inf_flavor                  = 0,                       0,
+   inf_flavor                  = bob,                       0,
    inf_initial_from_restart    = .false.,                 .false.,
    inf_sd_initial_from_restart = .false.,                 .false.,
    inf_deterministic           = .true.,                  .true.,