[Dart-dev] DART/branches Revision: 13204

[dart at ucar.edu]

thoar at ucar.edu
2019-07-23 16:45:08 -0600 (Tue, 23 Jul 2019)
36
Adding second string for messages.




Modified: DART/branches/coamps/assimilation_code/modules/assimilation/adaptive_inflate_mod.f90
===================================================================
--- DART/branches/coamps/assimilation_code/modules/assimilation/adaptive_inflate_mod.f90	2019-07-23 18:46:05 UTC (rev 13203)
+++ DART/branches/coamps/assimilation_code/modules/assimilation/adaptive_inflate_mod.f90	2019-07-23 22:45:08 UTC (rev 13204)
@@ -84,7 +84,7 @@
 integer, parameter :: AND2009 = 2
 
 ! Module storage for writing error messages
-character(len=512) :: msgstring, msgstring2
+character(len=512) :: string1, string2, string3
 
 ! Flag indicating whether module has been initialized
 logical :: initialized = .false.
@@ -250,8 +250,8 @@
 
 ! Cannot support non-determistic inflation and an inf_lower_bound < 1
 if(.not. deterministic .and. inf_lower_bound < 1.0_r8) then
-   write(msgstring, *) 'Cannot have non-deterministic inflation and inf_lower_bound < 1'
-   call error_handler(E_ERR, 'adaptive_inflate_init', msgstring, source, revision, revdate)
+   write(string1, *) 'Cannot have non-deterministic inflation and inf_lower_bound < 1'
+   call error_handler(E_ERR, 'adaptive_inflate_init', string1, source, revision, revdate)
 endif
 
 ! give these distinctive values; if inflation is being used
@@ -264,12 +264,12 @@
 ! Read type 1 (observation space inflation)
 if(inf_flavor == 1) then
 
-   write(msgstring,  *) 'No longer supporting observation space inflation ', &
+   write(string1,  *) 'No longer supporting observation space inflation ', &
                         '(i.e. inf_flavor = 1).'
-   write(msgstring2, *) 'Please contact dart at ucar.edu if you would like to use ', &
+   write(string2, *) 'Please contact dart at ucar.edu if you would like to use ', &
                         'observation space inflation'
    call error_handler(E_ERR, 'adaptive_inflate_init', &
-      msgstring, source, revision, revdate, text2=msgstring2)
+      string1, source, revision, revdate, text2=string2)
 
 endif
 
@@ -286,10 +286,10 @@
 do_obs_inflate = (inflate_handle%inflation_flavor == 1)
 
 if (do_obs_inflate) then
-  write(msgstring,  *) 'observation space inflation not suppported (i.e. inf_flavor = 1)'
-  write(msgstring2, *) 'please contact dart if you would like to use this functionality'
+  write(string1,  *) 'observation space inflation not suppported (i.e. inf_flavor = 1)'
+  write(string2, *) 'please contact dart if you would like to use this functionality'
   call error_handler(E_ERR, 'do_obs_inflate', &
-     msgstring, source, revision, revdate, text2=msgstring2)
+     string1, source, revision, revdate, text2=string2)
 endif
 
 end function do_obs_inflate
@@ -387,14 +387,14 @@
 
 do i = 1, 2
    if(inf_flavor(i) < 0 .or. inf_flavor(i) > 5) then
-      write(msgstring, *) 'inf_flavor=', inf_flavor(i), ' Must be 0, 1, 2, 3, 4, or 5 '
-      call error_handler(E_ERR,'validate_inflate_options', msgstring, source, revision, revdate, &
+      write(string1, *) 'inf_flavor=', inf_flavor(i), ' Must be 0, 1, 2, 3, 4, or 5 '
+      call error_handler(E_ERR,'validate_inflate_options', string1, source, revision, revdate, &
                                 text2='Inflation type for '//string(i))
    endif
 
    if(inf_damping(i) < 0.0_r8 .or. inf_damping(i) > 1.0_r8) then
-      write(msgstring, *) 'inf_damping=', inf_damping(i), ' Must be 0.0 <= d <= 1.0'
-      call error_handler(E_ERR,'validate_inflate_options', msgstring, source, revision, revdate, &
+      write(string1, *) 'inf_damping=', inf_damping(i), ' Must be 0.0 <= d <= 1.0'
+      call error_handler(E_ERR,'validate_inflate_options', string1, source, revision, revdate, &
                                 text2='Inflation damping for '//string(i))
    endif
 end do
@@ -415,8 +415,8 @@
 
 ! Cannot select posterior options if not computing posterior
 if(.not. compute_posterior .and. inf_flavor(2) > 0) then
-   write(msgstring, *) 'cannot enable posterior inflation if not computing posterior values'
-   call error_handler(E_ERR,'validate_inflate_options', msgstring, source, revision, revdate, &
+   write(string1, *) 'cannot enable posterior inflation if not computing posterior values'
+   call error_handler(E_ERR,'validate_inflate_options', string1, source, revision, revdate, &
                              text2='"compute_posterior" is false; posterior inflation flavor must be 0')
 endif
 
@@ -447,8 +447,8 @@
    ! check inf_sd_max_change() for valid range
    do i=1, 2
       if (inf_sd_max_change(i) < 1.0_r8 .or. inf_sd_max_change(i) > 2.0_r8) then
-         write(msgstring, *) 'inf_sd_max_change=', inf_sd_max_change(i), ' Must be 1.0 <= X <= 2.0'
-         call error_handler(E_ERR,'validate_inflate_options', msgstring, source, revision, revdate, &
+         write(string1, *) 'inf_sd_max_change=', inf_sd_max_change(i), ' Must be 1.0 <= X <= 2.0'
+         call error_handler(E_ERR,'validate_inflate_options', string1, source, revision, revdate, &
                                    text2='Inflation stddev max change for '//string(i))
       endif
    enddo
@@ -481,8 +481,8 @@
 
    if ( do_rtps_inflate(inflate_handle)) then
       if ( .not. present(fsprd) .or. .not. present(asprd)) then 
-         write(msgstring, *) 'missing arguments for RTPS inflation, should not happen'
-         call error_handler(E_ERR,'inflate_ens',msgstring,source,revision,revdate)