[Dart-dev] [3350] DART/trunk/models/MITgcm_ocean: Minor tweaks to MIT ocean model code .

[nancy at ucar.edu]

An HTML attachment was scrubbed...
URL: http://mailman.ucar.edu/pipermail/dart-dev/attachments/20080516/5df17073/attachment.html
-------------- next part --------------
Modified: DART/trunk/models/MITgcm_ocean/column_rand.f90
===================================================================
--- DART/trunk/models/MITgcm_ocean/column_rand.f90	2008-05-16 19:35:31 UTC (rev 3349)
+++ DART/trunk/models/MITgcm_ocean/column_rand.f90	2008-05-16 19:41:04 UTC (rev 3350)
@@ -12,8 +12,7 @@
 ! $Date: 2007-11-01 17:21:49 -0600 (Thu, 01 Nov 2007) $
 
 ! Allows creation of input file for generating a set of randomly located
-! observation stations with full column of obs for b-grid model. Should be
-! nearly identical to similar thing for CAM, etc.
+! observation stations with full column of obs.
 
 use      types_mod, only : r8, PI
 use random_seq_mod, only : random_seq_type, init_random_seq, random_uniform

Modified: DART/trunk/models/MITgcm_ocean/model_mod.f90
===================================================================
--- DART/trunk/models/MITgcm_ocean/model_mod.f90	2008-05-16 19:35:31 UTC (rev 3349)
+++ DART/trunk/models/MITgcm_ocean/model_mod.f90	2008-05-16 19:41:04 UTC (rev 3350)
@@ -547,19 +547,23 @@
 ! the changed state after a timestep. The time argument is intent
 ! in and is used for models that need to know the date/time to 
 ! compute a timestep, for instance for radiation computations.
-! This interface is only called if the namelist parameter
-! async is set to 0 in perfect_model_obs of filter or if the 
+! This interface is only called IF the namelist parameter
+! async is set to 0 in perfect_model_obs or filter -OR- if the 
 ! program integrate_model is to be used to advance the model
-! state as a separate executable. If one of these options
-! is not going to be used (the model will only be advanced as
-! a separate model-specific executable), this can be a 
-! NULL INTERFACE.
+! state as a separate executable. If none of these options
+! are used (the model will only be advanced as a separate 
+! model-specific executable), this can be a NULL INTERFACE.
 
 real(r8),        intent(inout) :: x(:)
 type(time_type), intent(in)    :: time
 
 if ( .not. module_initialized ) call static_init_model
 
+if (do_output()) then
+   call print_time(time,'NULL interface adv_1step (no advance) DART time is')
+   call print_time(time,'NULL interface adv_1step (no advance) DART time is',logfileunit)
+endif
+
 end subroutine adv_1step
 
 

Modified: DART/trunk/models/MITgcm_ocean/trans_pv_sv.f90
===================================================================
--- DART/trunk/models/MITgcm_ocean/trans_pv_sv.f90	2008-05-16 19:35:31 UTC (rev 3349)
+++ DART/trunk/models/MITgcm_ocean/trans_pv_sv.f90	2008-05-16 19:41:04 UTC (rev 3350)
@@ -95,7 +95,7 @@
 model_time = timestep_to_DARTtime(timestep)
 
 call print_time(model_time,'time for '//file_base)
-call print_date(model_time,'time for '//file_base)
+call print_date(model_time,'date for '//file_base)
 
 
 x_size = get_model_size()

Modified: DART/trunk/models/MITgcm_ocean/work/input.nml
===================================================================
--- DART/trunk/models/MITgcm_ocean/work/input.nml	2008-05-16 19:35:31 UTC (rev 3349)
+++ DART/trunk/models/MITgcm_ocean/work/input.nml	2008-05-16 19:41:04 UTC (rev 3350)
@@ -2,8 +2,8 @@
    start_from_restart    = .true.,
    output_restart        = .true.,
    async                 = 0,
-   init_time_days        = 0,
-   init_time_seconds     = 0,
+   init_time_days        = -1,
+   init_time_seconds     = -1,
    first_obs_days        = -1,
    first_obs_seconds     = -1,
    last_obs_days         = -1,
@@ -18,20 +18,20 @@
 &filter_nml
    async                    = 0,
    adv_ens_command          = "./advance_model.csh",
-   ens_size                 = 20,
-   start_from_restart       = .true.,
+   ens_size                 = 4,
+   start_from_restart       = .false.,
    output_restart           = .true.,
    obs_sequence_in_name     = "obs_seq.out",
    obs_sequence_out_name    = "obs_seq.final",
-   restart_in_file_name     = "filter_ics",
+   restart_in_file_name     = "perfect_ics",
    restart_out_file_name    = "filter_restart",
-   init_time_days           = 0,
-   init_time_seconds        = 0,
+   init_time_days           = -1,
+   init_time_seconds        = -1,
    first_obs_days           = -1,
    first_obs_seconds        = -1,
    last_obs_days            = -1,
    last_obs_seconds         = -1,
-   num_output_state_members = 0,
+   num_output_state_members = 4,
    num_output_obs_members   = 0,
    output_interval          = 1,
    num_groups               = 1,
@@ -91,9 +91,11 @@
    write_binary_obs_sequence = .false.  /
 
 &obs_kind_nml
-   assimilate_these_obs_types = 'TEMPERATURE',
+   assimilate_these_obs_types = 'SALINITY',
+                                'TEMPERATURE',
                                 'U_CURRENT_COMPONENT',
-                                'V_CURRENT_COMPONENT' /
+                                'V_CURRENT_COMPONENT',
+                                'SEA_SURFACE_HEIGHT'  /
 
 &preprocess_nml
     input_obs_kind_mod_file = '../../../obs_kind/DEFAULT_obs_kind_mod.F90',
@@ -120,7 +122,7 @@
    approximate_distance        = .true.,
    nlon                        = 71,
    nlat                        = 36,
-   output_box_info             = .false.  /
+   output_box_info             = .true.  /
 
 &utilities_nml
    TERMLEVEL = 1,
@@ -132,7 +134,7 @@
    ens_size                     =  1,
    single_restart_file_in       = .true.,
    single_restart_file_out      = .true.,
-   write_binary_restart_files   = .true.,
+   write_binary_restart_files   = .false.,
    overwrite_data_time          = .false.,
    new_data_days                =  -1,
    new_data_secs                =  -1,