[Dart-dev] DART/branches Revision: 10978

[dart at ucar.edu]

hendric at ucar.edu
2017-02-01 11:58:00 -0700 (Wed, 01 Feb 2017)
152
perfect model obs is running and appears to be bitwise with the trunk!
can use output from pmo as input to filter and perturb to generate
an ensemble.




Modified: DART/branches/rma_single_file/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_single_file/filter/filter_mod.f90	2017-02-01 18:15:42 UTC (rev 10977)
+++ DART/branches/rma_single_file/filter/filter_mod.f90	2017-02-01 18:58:00 UTC (rev 10978)
@@ -2135,7 +2135,7 @@
 
 !>@todo revisit if we should be clamping mean copy for file_info_output
 if ( output_restarts )      &
-   call set_io_copy_flag(file_info, MEM_START, MEM_END, WRITE_COPY, & num_output_ens=num_ens, clamp_vars=do_clamping)
+   call set_io_copy_flag(file_info, MEM_START, MEM_END, WRITE_COPY, num_output_ens=num_ens, clamp_vars=do_clamping)
 if ( output_mean )          &
    call set_io_copy_flag(file_info, ENS_MEAN,           WRITE_COPY, clamp_vars=do_clamping)
 if ( output_sd )            &

Modified: DART/branches/rma_single_file/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_single_file/io/io_filenames_mod.f90	2017-02-01 18:15:42 UTC (rev 10977)
+++ DART/branches/rma_single_file/io/io_filenames_mod.f90	2017-02-01 18:58:00 UTC (rev 10978)
@@ -1029,9 +1029,12 @@
 if (c <=0) return
 
 file_info%stage_metadata%io_flag(c)   = io_flag 
-if(present(has_units)  ) file_info%stage_metadata%has_units( c) = has_units 
-if(present(clamp_vars) ) file_info%stage_metadata%clamp_vars(c) = clamp_vars
 
+if(present(has_units)  )    file_info%stage_metadata%has_units( c) = has_units 
+if(present(clamp_vars) )    file_info%stage_metadata%clamp_vars(c) = clamp_vars
+
+file_info%stage_metadata%noutput_ens = 1
+
 end subroutine set_io_copy_flag_single
 
 

Modified: DART/branches/rma_single_file/io/state_space_diag_mod.f90
===================================================================
--- DART/branches/rma_single_file/io/state_space_diag_mod.f90	2017-02-01 18:15:42 UTC (rev 10977)
+++ DART/branches/rma_single_file/io/state_space_diag_mod.f90	2017-02-01 18:58:00 UTC (rev 10978)
@@ -91,6 +91,7 @@
           finalize_singlefile_output, &
           aoutput_variable, &
           aoutput_diagnostics, &
+          get_netcdf_file_type, &
           write_singlefile, &
           netcdf_file_type
 
@@ -180,10 +181,10 @@
 integer :: num_output_ens
 
 if (my_task_id() == 0) then
-   !#! if(.not. byteSizesOK()) then
-   !#!     call error_handler(E_ERR,'init_singlefile_output', &
-   !#!    'Compiler does not support required kinds of variables.',source,revision,revdate) 
-   !#! end if
+   if(.not. byteSizesOK()) then
+       call error_handler(E_ERR,'init_singlefile_output', &
+      'Compiler does not support required kinds of variables.',source,revision,revdate) 
+   end if
 
    FileName       = get_single_filename(file_handle)
    num_output_ens = file_handle%stage_metadata%noutput_ens
@@ -217,17 +218,14 @@
    call nc_check(nf90_def_dim(ncid=ncFileID%ncid, &
                  name="metadatalength", len=metadata_length, dimid=MetaDataDimID), &
                  'init_singlefile_output', 'def_dim metadatalength '//trim(fname))
-   !#! print*, 'metadatalength', metadata_length, MetaDataDimID, trim(fname)
    
    call nc_check(nf90_def_dim(ncid=ncFileID%ncid, &
                  name="member", len=num_output_ens, dimid=MemberDimID), &
                  'init_singlefile_output', 'def_dim member '//trim(fname))
-   !#! print*, 'member        ', num_output_ens, MemberDimID, trim(fname)
    
    call nc_check(nf90_def_dim(ncid=ncFileID%ncid, name="time", &
                  len=nf90_unlimited, dimid=TimeDimID), &
                  'init_singlefile_output', 'def_dim time '//trim(fname))
-   !#! print*, 'time          ', nf90_unlimited, TimeDimID, trim(fname)
 
    !----------------------------------------------------------------------------
    ! Define the model-specific components
@@ -294,7 +292,7 @@
    !    Metadata for each Copy
    call nc_check(nf90_def_var(ncid=ncFileID%ncid,name="MemberMetaData", xtype=nf90_char,    &
                  dimids = (/ MetaDataDimID, MemberDimID /),  varid=metadataVarID), &
-                 'init_singlefile_output', 'def_var CopyMetaData')
+                 'init_singlefile_output', 'def_var MemberMetaData')
    call nc_check(nf90_put_att(ncFileID%ncid, metadataVarID, "long_name",       &
                  "Metadata for each copy/member"), 'init_singlefile_output', 'put_att long_name')
    
@@ -467,65 +465,15 @@
 ! model_mod:nc_write_model_vars knows nothing about assim_model_types,
 ! so we must pass the components.
 ! no need to do this anymore
-if(ncFileID%model_mod_will_write_state_variables) then
-   i = nc_write_model_vars(myNcid, model_state, copyindex, timeindex)
-else ! dart core code writes the diagnostic file
+!#! if(ncFileID%model_mod_will_write_state_variables) then
+!#!    i = nc_write_model_vars(myNcid, model_state, copyindex, timeindex)
+!#! else ! dart core code writes the diagnostic file
    call write_model_variables(ncFileID, model_state, copyindex, model_time)
-endif
+!#! endif