[Dart-dev] DART/branches Revision: 12834

[dart at ucar.edu]

nancy at ucar.edu
2018-09-20 09:09:38 -0600 (Thu, 20 Sep 2018)
159
make '' act the same in a namelist as 'NULL' when
setting the stages to output diagnostic files.

keep dopplerfold version in sync with the main
filter code.




Modified: DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90	2018-09-18 21:35:21 UTC (rev 12833)
+++ DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90	2018-09-20 15:09:38 UTC (rev 12834)
@@ -2354,7 +2354,7 @@
 do i = 1, nstages
    my_stage = stages(i)
    call to_upper(my_stage)
-   if (trim(my_stage) /= trim('NULL')) then
+   if (my_stage /= 'NULL' .and. my_stage /= '') then
    SELECT CASE (my_stage)
       CASE ('INPUT', 'FORECAST', 'PREASSIM', 'POSTASSIM', 'ANALYSIS', 'OUTPUT')
          call set_stage_to_write(stages(i),.true.)

Modified: DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.f90	2018-09-18 21:35:21 UTC (rev 12833)
+++ DART/branches/rma_trunk/assimilation_code/modules/assimilation/filter_mod.f90	2018-09-20 15:09:38 UTC (rev 12834)
@@ -2340,7 +2340,7 @@
 do i = 1, nstages
    my_stage = stages(i)
    call to_upper(my_stage)
-   if (trim(my_stage) /= trim('NULL')) then
+   if (my_stage /= 'NULL' .and. my_stage /= '') then
    SELECT CASE (my_stage)
       CASE ('INPUT', 'FORECAST', 'PREASSIM', 'POSTASSIM', 'ANALYSIS', 'OUTPUT')
          call set_stage_to_write(stages(i),.true.)