[Dart-dev] DART/branches Revision: 11914

[dart at ucar.edu]

hendric at ucar.edu
2017-08-28 16:55:32 -0600 (Mon, 28 Aug 2017)
76
istatus is an array so we need to use a where statement rather than an if.




Modified: DART/branches/rma_fix_clm_restarts/models/clm/model_mod.f90
===================================================================
--- DART/branches/rma_fix_clm_restarts/models/clm/model_mod.f90	2017-08-28 22:11:08 UTC (rev 11913)
+++ DART/branches/rma_fix_clm_restarts/models/clm/model_mod.f90	2017-08-28 22:55:32 UTC (rev 11914)
@@ -2182,7 +2182,7 @@
    interp_val = total/total_area
 elsewhere
    interp_val = MISSING_R8
-   if (istatus == 0) istatus = 32
+   where (istatus == 0) istatus = 32
 endwhere
 
 !# if( any(istatus == 32) ) then

Modified: DART/branches/rma_fix_clm_restarts/models/clm/work/path_names_filter
===================================================================
--- DART/branches/rma_fix_clm_restarts/models/clm/work/path_names_filter	2017-08-28 22:11:08 UTC (rev 11913)
+++ DART/branches/rma_fix_clm_restarts/models/clm/work/path_names_filter	2017-08-28 22:55:32 UTC (rev 11914)
@@ -22,8 +22,8 @@
 assimilation_code/modules/utilities/distributed_state_mod.f90
 assimilation_code/modules/utilities/ensemble_manager_mod.f90
 assimilation_code/modules/utilities/netcdf_utilities_mod.f90
-assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
-assimilation_code/modules/utilities/null_win_mod.f90
+assimilation_code/modules/utilities/mpi_utilities_mod.f90
+assimilation_code/modules/utilities/no_cray_win_mod.f90
 assimilation_code/modules/utilities/obs_impact_mod.f90
 assimilation_code/modules/utilities/options_mod.f90
 assimilation_code/modules/utilities/parse_args_mod.f90

Modified: DART/branches/rma_fix_clm_restarts/models/clm/work/path_names_model_mod_check
===================================================================
--- DART/branches/rma_fix_clm_restarts/models/clm/work/path_names_model_mod_check	2017-08-28 22:11:08 UTC (rev 11913)
+++ DART/branches/rma_fix_clm_restarts/models/clm/work/path_names_model_mod_check	2017-08-28 22:55:32 UTC (rev 11914)
@@ -22,8 +22,8 @@
 assimilation_code/modules/utilities/distributed_state_mod.f90
 assimilation_code/modules/utilities/ensemble_manager_mod.f90
 assimilation_code/modules/utilities/netcdf_utilities_mod.f90
-assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
-assimilation_code/modules/utilities/null_win_mod.f90
+assimilation_code/modules/utilities/mpi_utilities_mod.f90
+assimilation_code/modules/utilities/no_cray_win_mod.f90
 assimilation_code/modules/utilities/obs_impact_mod.f90
 assimilation_code/modules/utilities/options_mod.f90
 assimilation_code/modules/utilities/parse_args_mod.f90

Modified: DART/branches/rma_fix_clm_restarts/models/clm/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/rma_fix_clm_restarts/models/clm/work/path_names_perfect_model_obs	2017-08-28 22:11:08 UTC (rev 11913)
+++ DART/branches/rma_fix_clm_restarts/models/clm/work/path_names_perfect_model_obs	2017-08-28 22:55:32 UTC (rev 11914)
@@ -22,8 +22,8 @@
 assimilation_code/modules/utilities/distributed_state_mod.f90
 assimilation_code/modules/utilities/ensemble_manager_mod.f90
 assimilation_code/modules/utilities/netcdf_utilities_mod.f90
-assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
-assimilation_code/modules/utilities/null_win_mod.f90
+assimilation_code/modules/utilities/mpi_utilities_mod.f90
+assimilation_code/modules/utilities/no_cray_win_mod.f90
 assimilation_code/modules/utilities/obs_impact_mod.f90
 assimilation_code/modules/utilities/options_mod.f90
 assimilation_code/modules/utilities/parse_args_mod.f90