[Dart-dev] [4162] DART/trunk/models/MITgcm_annulus: Random cleanup so this model compiles again. It has n

[nancy at ucar.edu]

Revision: 4162
Author:   nancy
Date:     2009-11-25 13:50:16 -0700 (Wed, 25 Nov 2009)
Log Message:
-----------
Random cleanup so this model compiles again.  It has not been
tested to see if it runs.

Modified Paths:
--------------
    DART/trunk/models/MITgcm_annulus/model_mod.f90
    DART/trunk/models/MITgcm_annulus/trans_dart_to_MITgcm.f90
    DART/trunk/models/MITgcm_annulus/work/input.nml
    DART/trunk/models/MITgcm_annulus/work/path_names_create_fixed_network_seq
    DART/trunk/models/MITgcm_annulus/work/path_names_create_obs_sequence
    DART/trunk/models/MITgcm_annulus/work/path_names_filter
    DART/trunk/models/MITgcm_annulus/work/path_names_perfect_model_obs

-------------- next part --------------
Modified: DART/trunk/models/MITgcm_annulus/model_mod.f90
===================================================================
--- DART/trunk/models/MITgcm_annulus/model_mod.f90	2009-11-25 18:06:28 UTC (rev 4161)
+++ DART/trunk/models/MITgcm_annulus/model_mod.f90	2009-11-25 20:50:16 UTC (rev 4162)
@@ -470,7 +470,7 @@
 
 
 
-!subroutine model_get_close_states(o_loc, radius, inum, indices, dist, x)
+subroutine model_get_close_states(o_loc, radius, inum, indices, dist, x)
 !------------------------------------------------------------------
 !
 ! Returns the number of state variables that are within a given
@@ -753,7 +753,7 @@
 ! write(6,*) i, indices(i), dist(i)
 !Xend do
 
-!end subroutine model_get_close_states
+end subroutine model_get_close_states
 
 
 subroutine vector_to_prog_var(x, var)

Modified: DART/trunk/models/MITgcm_annulus/trans_dart_to_MITgcm.f90
===================================================================
--- DART/trunk/models/MITgcm_annulus/trans_dart_to_MITgcm.f90	2009-11-25 18:06:28 UTC (rev 4161)
+++ DART/trunk/models/MITgcm_annulus/trans_dart_to_MITgcm.f90	2009-11-25 20:50:16 UTC (rev 4162)
@@ -55,7 +55,7 @@
 real(r8), allocatable    :: r8seg(:)
 real(r8), allocatable    :: dart(:)
 type(time_type)          :: dart_time(2)
-integer                  :: icount, j, k, irec
+integer                  :: icount, j, k, irec, days, seconds
 integer                  :: ierr, iunit, io, dart_unit
 logical, parameter       :: debug = .false.
 
@@ -121,8 +121,9 @@
 ! write the contents of the second element of dart_time to a file
 ! for use by trans_MITgcm_to_dart
 open(unit=777,file="dart_time.dat",status="unknown")
-write(777,*) dart_time(1)
-write(6,*) 'dart_time in trans_dart_to_MITgcm', dart_time(1)
+call get_time(dart_time(1), seconds, days)
+write(777,*) days, seconds
+write(6,*) 'dart_time in trans_dart_to_MITgcm', days, seconds
 close(777)
 
 ! read in the original MITgcm restart file so that variables not

Modified: DART/trunk/models/MITgcm_annulus/work/input.nml
===================================================================
--- DART/trunk/models/MITgcm_annulus/work/input.nml	2009-11-25 18:06:28 UTC (rev 4161)
+++ DART/trunk/models/MITgcm_annulus/work/input.nml	2009-11-25 20:50:16 UTC (rev 4162)
@@ -137,7 +137,7 @@
    output_obs_def_mod_file = '../../../obs_def/obs_def_mod.f90', 
    input_obs_kind_mod_file = '../../../obs_kind/DEFAULT_obs_kind_mod.F90', 
   output_obs_kind_mod_file = '../../../obs_kind/obs_kind_mod.f90', 
-               input_files = '../../../obs_def/obs_def_1d_state_mod.f90'  /
+               input_files = '../../../obs_def/obs_def_reanalysis_bufr_mod.f90'  /
 
 &restart_file_utility_nml
    input_file_name              = "filter_restart",

Modified: DART/trunk/models/MITgcm_annulus/work/path_names_create_fixed_network_seq
===================================================================
--- DART/trunk/models/MITgcm_annulus/work/path_names_create_fixed_network_seq	2009-11-25 18:06:28 UTC (rev 4161)
+++ DART/trunk/models/MITgcm_annulus/work/path_names_create_fixed_network_seq	2009-11-25 20:50:16 UTC (rev 4162)
@@ -1,6 +1,5 @@
 obs_sequence/create_fixed_network_seq.f90
 obs_sequence/obs_sequence_mod.f90
-obs_kind/annulus/obs_kind_mod.f90
 obs_kind/obs_kind_mod.f90
 obs_def/obs_def_mod.f90
 assim_model/assim_model_mod.f90

Modified: DART/trunk/models/MITgcm_annulus/work/path_names_create_obs_sequence
===================================================================
--- DART/trunk/models/MITgcm_annulus/work/path_names_create_obs_sequence	2009-11-25 18:06:28 UTC (rev 4161)
+++ DART/trunk/models/MITgcm_annulus/work/path_names_create_obs_sequence	2009-11-25 20:50:16 UTC (rev 4162)
@@ -2,9 +2,9 @@
 obs_sequence/obs_sequence_mod.f90
 obs_model/obs_model_mod.f90
 obs_kind/obs_kind_mod.f90
-obs_kind/annulus/obs_kind_mod.f90
 obs_def/obs_def_mod.f90
 assim_model/assim_model_mod.f90
+ensemble_manager/ensemble_manager_mod.f90
 models/MITgcm_annulus/model_mod.f90
 common/types_mod.f90
 location/annulus/location_mod.f90

Modified: DART/trunk/models/MITgcm_annulus/work/path_names_filter
===================================================================
--- DART/trunk/models/MITgcm_annulus/work/path_names_filter	2009-11-25 18:06:28 UTC (rev 4161)
+++ DART/trunk/models/MITgcm_annulus/work/path_names_filter	2009-11-25 20:50:16 UTC (rev 4162)
@@ -6,7 +6,6 @@
 sort/sort_mod.f90
 cov_cutoff/cov_cutoff_mod.f90
 obs_sequence/obs_sequence_mod.f90
-obs_kind/annulus/obs_kind_mod.f90
 obs_model/obs_model_mod.f90
 obs_kind/obs_kind_mod.f90
 obs_def/obs_def_mod.f90

Modified: DART/trunk/models/MITgcm_annulus/work/path_names_perfect_model_obs
===================================================================
--- DART/trunk/models/MITgcm_annulus/work/path_names_perfect_model_obs	2009-11-25 18:06:28 UTC (rev 4161)
+++ DART/trunk/models/MITgcm_annulus/work/path_names_perfect_model_obs	2009-11-25 20:50:16 UTC (rev 4162)
@@ -5,12 +5,12 @@
 sort/sort_mod.f90
 cov_cutoff/cov_cutoff_mod.f90
 obs_sequence/obs_sequence_mod.f90
-obs_kind/annulus/obs_kind_mod.f90
 obs_model/obs_model_mod.f90
 obs_kind/obs_kind_mod.f90
 obs_def/obs_def_mod.f90
 assim_model/assim_model_mod.f90
 common/types_mod.f90
+ensemble_manager/ensemble_manager_mod.f90
 location/annulus/location_mod.f90
 random_seq/random_seq_mod.f90
 random_nr/random_nr_mod.f90