[Dart-dev] Added/ Revision: 12542

[dart at ucar.edu]

nancy at ucar.edu
2018-04-19 13:16:40 -0600 (Thu, 19 Apr 2018)
298
minor updates to a slew of files.  mostly moving nc_check use from
utilities to netcdf_utilities, and removing direct writes to the logfileunit
(at least in the non-model_mod.f90 files).  calling log_it() for debug
lines, and using the error_handler for things that are expected as normal
output.




Modified: DART/branches/all_nsc_changes/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90
===================================================================
--- DART/branches/all_nsc_changes/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90	2018-04-19 19:06:24 UTC (rev 12541)
+++ DART/branches/all_nsc_changes/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90	2018-04-19 19:16:40 UTC (rev 12542)
@@ -1192,10 +1192,6 @@
 
 call     trace_message('Filter done')
 call timestamp_message('Filter done')
-if(my_task_id() == 0) then
-   write(logfileunit,*)'FINISHED filter.'
-   write(logfileunit,*)
-endif
 
 end subroutine filter_main
 

Modified: DART/branches/all_nsc_changes/assimilation_code/modules/assimilation/filter_mod.f90
===================================================================
--- DART/branches/all_nsc_changes/assimilation_code/modules/assimilation/filter_mod.f90	2018-04-19 19:06:24 UTC (rev 12541)
+++ DART/branches/all_nsc_changes/assimilation_code/modules/assimilation/filter_mod.f90	2018-04-19 19:16:40 UTC (rev 12542)
@@ -1189,10 +1189,6 @@
 
 call     trace_message('Filter done')
 call timestamp_message('Filter done')
-if(my_task_id() == 0) then
-   write(logfileunit,*)'FINISHED filter.'
-   write(logfileunit,*)
-endif
 
 end subroutine filter_main
 

Modified: DART/branches/all_nsc_changes/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/all_nsc_changes/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-04-19 19:06:24 UTC (rev 12541)
+++ DART/branches/all_nsc_changes/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-04-19 19:16:40 UTC (rev 12542)
@@ -16,24 +16,25 @@
 
 use        types_mod, only : obstypelength
 use    utilities_mod, only : register_module, error_handler, E_ERR, E_WARN,  &
-                             logfileunit, find_namelist_in_file, log_it,     &
+                             find_namelist_in_file, log_it,                  &
                              check_namelist_read, do_output, ascii_file_format
 
 implicit none
 private
 
-public :: get_name_for_type_of_obs, assimilate_this_type_of_obs, &
-          evaluate_this_type_of_obs, get_quantity_for_type_of_obs, get_index_for_type_of_obs, &
-          write_type_of_obs_table, read_type_of_obs_table, get_type_of_obs_from_menu, map_type_of_obs_table,  &
-          use_ext_prior_this_type_of_obs, get_name_for_quantity, get_index_for_quantity
+public :: get_name_for_type_of_obs, &
+          assimilate_this_type_of_obs, &
+          evaluate_this_type_of_obs, &
+          get_quantity_for_type_of_obs, &
+          get_index_for_type_of_obs, &
+          write_type_of_obs_table, &
+          read_type_of_obs_table, &
+          get_type_of_obs_from_menu, &
+          map_type_of_obs_table,  &
+          use_ext_prior_this_type_of_obs, &
+          get_name_for_quantity, &
+          get_index_for_quantity
 
-! Added by nsc to try to limit the number of global vars exported from
-! this program.  i do not like this terminology, but since we are still
-! using kind where we mean type, raw kind is as good a solution as anything.
-! when i get permission to change public interfaces (next significant public
-! release of the code), all kinds will become types, and raw_kind will become
-! plain kind.  or i'll dump type/kind altogether and go to specific/generic
-! or some other pair without this long history.
 public :: get_num_types_of_obs, get_num_quantities
 
 !----------------------------------------------------------------------------
@@ -482,25 +483,17 @@
 
 !! max_defined_types_of_obs is really max_obs_types, and is generated by preprocess.
 
-!! PRIVATE ONLY TO THIS MODULE.  max_defined_types_of_obs is really max_obs_types,
-!! but since the original variable name is public it can't change without
-!! being non-backwards compatible.  for now, punt on both type and kind
-!! and start trying to use specific and generic (ok, which do map to type
-!! and kind, respectively).  using intermediate names might make the transition
-!! less painful.  right now, many(most) of the subroutine names or args
-!! which are public are using 'kind' where it needs to be 'type'.
-integer, parameter :: max_obs_specific = max_defined_types_of_obs
 
 character(len=512) :: msg_string, msg_string1
 
-integer :: num_kind_assimilate, num_kind_evaluate 
-integer :: num_kind_use_precomputed_FOs
+integer :: num_types_assimilate, num_types_evaluate 
+integer :: num_types_use_precomputed_FOs
 
 ! Map from values of kind in obs_def to the fixed values in the list above.
 ! Initially, these are undefined and have values -1.
 ! For the first index 1, the value is the index in the input obs_sequence file.
 ! The first index 2 is the value of the corresponding index in this kind module.
-integer :: map(2, max_obs_specific) = -1
+integer :: map(2, max_defined_types_of_obs) = -1