[Dart-dev] DART/branches Revision: 12484

[dart at ucar.edu]

thoar at ucar.edu
2018-04-03 07:54:03 -0600 (Tue, 03 Apr 2018)
172
Using the common dart netcdf_utilities_mod.f90

This requires the renaming of a couple routines.
The path_names_files were updated to work with the
new rma_trunk updates.




Modified: DART/branches/openggcm/models/openggcm/model_mod.f90
===================================================================
--- DART/branches/openggcm/models/openggcm/model_mod.f90	2018-04-03 11:23:45 UTC (rev 12483)
+++ DART/branches/openggcm/models/openggcm/model_mod.f90	2018-04-03 13:54:03 UTC (rev 12484)
@@ -31,9 +31,11 @@
                              do_nml_file, do_nml_term, nmlfileunit, open_file,  &
                              close_file
 
-use  netcdf_utilities_mod, only : nc_add_global_attribute, nc_check, nc_sync,  &
-                                  nc_add_global_creation_time, nc_redef, nc_enddef, &
-                                  nc_get_variable
+use  netcdf_utilities_mod, only : nc_check, nc_get_variable, &
+                                  nc_add_global_attribute, &
+                                  nc_add_global_creation_time, &
+                                  nc_end_define_mode, &
+                                  nc_synchronize_file
 
 use          obs_kind_mod, only : QTY_ELECTRON_DENSITY, QTY_ELECTRIC_POTENTIAL, &
                                   get_index_for_quantity, get_name_for_quantity
@@ -1057,7 +1059,7 @@
 
 ! Finished with dimension/variable definitions, must end 'define' mode to fill.
 
-call nc_enddef(ncid, 'nc_write_model_atts enddef "'//trim(filename)//'"')
+call nc_end_define_mode(ncid, 'nc_write_model_atts enddef "'//trim(filename)//'"')
 
 !----------------------------------------------------------------------------
 ! Fill Geographic Grid values
@@ -1093,7 +1095,7 @@
 !-------------------------------------------------------------------------------
 ! Flush the buffer and leave netCDF file open
 !-------------------------------------------------------------------------------
-call nc_sync(ncid, 'nc_write_model_atts')
+call nc_synchronize_file(ncid, 'nc_write_model_atts')
 
 end subroutine nc_write_model_atts
 

Modified: DART/branches/openggcm/models/openggcm/work/input.nml
===================================================================
--- DART/branches/openggcm/models/openggcm/work/input.nml	2018-04-03 11:23:45 UTC (rev 12483)
+++ DART/branches/openggcm/models/openggcm/work/input.nml	2018-04-03 13:54:03 UTC (rev 12484)
@@ -1,20 +1,20 @@
 &perfect_model_obs_nml
    read_input_state_from_file = .true.
-   write_output_state_to_file = .true.
-   async                      = 0
+   input_state_files          = "DATA.ionos2.nc"
    init_time_days             = -1
    init_time_seconds          = -1
+
+   obs_seq_in_file_name       = "obs_seq.in"
+   obs_seq_out_file_name      = "obs_seq.perfect"
    first_obs_days             = -1
    first_obs_seconds          = -1
    last_obs_days              = -1
    last_obs_seconds           = -1
+
    single_file_in             = .false.
    single_file_out            = .false.
-   input_state_files          = "DATA.ionos2.nc"
+   write_output_state_to_file = .true.
    output_state_files         = "perfect_output.nc"
-   adv_ens_command            = "no_advance_script"
-   obs_seq_in_file_name       = "obs_seq.in"
-   obs_seq_out_file_name      = "obs_seq.perfect"
    trace_execution            = .true.
    output_timestamps          = .false.
    print_every_nth_obs        = -1
@@ -24,26 +24,19 @@
 
 
 &filter_nml
-   async                    = 0
-   adv_ens_command          = "no_advance_script"
+   input_state_file_list    = "input_list.txt"
+   init_time_days           = -1
+   init_time_seconds        = -1
    ens_size                 =  2
+   num_output_obs_members   = 10
+   num_output_state_members = 10
+
    obs_sequence_in_name     = "obs_seq.out"
    obs_sequence_out_name    = "obs_seq.final"
-   input_state_file_list    = "input_list.txt"
-   output_state_file_list   = "output_list.txt"
-   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 = 10
-   num_output_obs_members   = 10
-   output_interval          = 1
-   num_groups               = 1
-   output_forward_op_errors = .false.
-   output_timestamps        = .false.
-   trace_execution          = .true.
 
    stages_to_write          = 'preassim', 'analysis'