[Dart-dev] DART/branches Revision: 12196

dart at ucar.edu dart at ucar.edu
Mon Dec 11 17:09:50 MST 2017


thoar at ucar.edu
2017-12-11 17:09:49 -0700 (Mon, 11 Dec 2017)
398
Modifying the print format for types of observation assimilated, evaluated or precomputed.
Renamed some internal variable names that clashed with Fortran instrinsics.
'time', 'loc', 'index', 'type', and the like. The PG compiler issues warnings and carries on.
Given the problems I'm having with it, I am not willing to presume it is not causing problems.
There are many more namespace conflicts.




Modified: DART/branches/coamps/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/coamps/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2017-12-11 15:58:31 UTC (rev 12195)
+++ DART/branches/coamps/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2017-12-12 00:09:49 UTC (rev 12196)
@@ -894,39 +894,57 @@
    end do
 endif
 
-if (do_output() .and. (num_kind_assimilate > 0 .or. num_kind_evaluate > 0 .or.  &
+if (do_output() .and. (num_kind_assimilate          > 0 .or. &
+                       num_kind_evaluate            > 0 .or.  &
                        num_kind_use_precomputed_FOs > 0 )) then  
-   write(*, *) '------------------------------------------------------'
-   write(*, *)
 
-   write(logfileunit, *) 'Assimilate_these_obs_types'
    write(*, *)
+   write(*, *) '--------------------------------------------------------'
    write(*, *) '-------------- ASSIMILATE_THESE_OBS_TYPES --------------'
+   write(logfileunit, *)
+   write(logfileunit, *) 'Assimilate_these_obs_types:'
 
-   do i = 1, num_kind_assimilate
-      write(logfileunit, *) trim(assimilate_these_obs_types(i))
-      write(     *     , *) trim(assimilate_these_obs_types(i))
-   end do
+   if (num_kind_assimilate < 1) then
+         write(logfileunit, *) '   none'
+         write(     *     , *) '   none'
+   else
+      do i = 1, num_kind_assimilate
+         write(logfileunit, *) '   '//trim(assimilate_these_obs_types(i))
+         write(     *     , *) '   '//trim(assimilate_these_obs_types(i))
+      enddo
+   endif
 
-   write(logfileunit, *) 'Evaluate_these_obs_types'
-   write(*, *) '-------------- EVALUATE_THESE_OBS_TYPES --------------'
+   write(*, *) '--------------------------------------------------------'
+   write(*, *) '-------------- EVALUATE_THESE_OBS_TYPES   --------------'
+   write(logfileunit, *) 'Evaluate_these_obs_types:'
 
-   do i = 1, num_kind_evaluate
-      write(logfileunit, *) trim(evaluate_these_obs_types(i))
-      write(     *     , *) trim(evaluate_these_obs_types(i))
-   end do
-   write(*, *) '------------------------------------------------------'
-   write(*, *)
+   if (num_kind_evaluate <1) then
+         write(logfileunit, *) '   none'
+         write(     *     , *) '   none'
+   else
+      do i = 1, num_kind_evaluate
+         write(logfileunit, *) '   '//trim(evaluate_these_obs_types(i))
+         write(     *     , *) '   '//trim(evaluate_these_obs_types(i))
+      enddo
+   endif
 
-   write(logfileunit, *) 'Use the precomputed Prior Forward Operators for these obs types'
-   write(*, *) '---------- USE_PRECOMPUTED_FO_OBS_TYPES --------------'
+   write(*, *) '--------------------------------------------------------'
+   write(*, *) '---------- USE_PRECOMPUTED_FO_OBS_TYPES   --------------'
+   write(logfileunit, *) 'Use the precomputed Prior Forward Operators for these obs types:'
 
-   do i = 1, num_kind_use_precomputed_FOs
-      write(logfileunit, *) trim(use_precomputed_FOs_these_obs_types(i))
-      write(     *     , *) trim(use_precomputed_FOs_these_obs_types(i))
-   end do
-   write(*, *) '------------------------------------------------------'
+   if (num_kind_use_precomputed_FOs <1) then
+         write(logfileunit, *) '   none'
+         write(     *     , *) '   none'
+   else
+      do i = 1, num_kind_use_precomputed_FOs
+         write(logfileunit, *) trim(use_precomputed_FOs_these_obs_types(i))
+         write(     *     , *) trim(use_precomputed_FOs_these_obs_types(i))
+      enddo
+   endif
+
+   write(*, *) '--------------------------------------------------------'
    write(*, *)
+   write(logfileunit, *)
 
 endif
 

Modified: DART/branches/coamps/assimilation_code/programs/perfect_model_obs/perfect_model_obs.f90
===================================================================
--- DART/branches/coamps/assimilation_code/programs/perfect_model_obs/perfect_model_obs.f90	2017-12-11 15:58:31 UTC (rev 12195)
+++ DART/branches/coamps/assimilation_code/programs/perfect_model_obs/perfect_model_obs.f90	2017-12-12 00:09:49 UTC (rev 12196)
@@ -777,16 +777,16 @@
 end subroutine print_obs_time
 
 !-------------------------------------------------------------------------
+!>@todo this routine is not called anywhere - candidate for removal.
 
-subroutine perfect_set_initial_time(time)
+subroutine perfect_set_initial_time(initial_time)
 
-type(time_type), intent(out) :: time
+type(time_type), intent(out) :: initial_time


More information about the Dart-dev mailing list