[Dart-dev] DART/branches Revision: 13205

[dart at ucar.edu]

thoar at ucar.edu
2019-07-23 16:48:07 -0600 (Tue, 23 Jul 2019)
150
model_mod.f90 and location_mod.f90 no longer have i8 indices
where they are not needed.

The change to obs_def_navdas_mod.f90 is a simple line wrap.




Modified: DART/branches/coamps/assimilation_code/location/threed_sphere/location_mod.f90
===================================================================
--- DART/branches/coamps/assimilation_code/location/threed_sphere/location_mod.f90	2019-07-23 22:45:08 UTC (rev 13204)
+++ DART/branches/coamps/assimilation_code/location/threed_sphere/location_mod.f90	2019-07-23 22:48:07 UTC (rev 13205)
@@ -1385,7 +1385,7 @@
 type(get_close_type),          intent(in)  :: gc
 type(location_type),           intent(inout) :: base_loc, locs(:)
 integer,                       intent(in)  :: base_type, loc_qtys(:), loc_types(:)
-integer(i8),                   intent(out) :: num_close, close_ind(:)
+integer,                       intent(out) :: num_close, close_ind(:)
 real(r8),            optional, intent(out) :: dist(:)
 type(ensemble_type), optional, intent(in)  :: ens_handle
 
@@ -1407,7 +1407,7 @@
 type(location_type),           intent(inout)  :: base_loc, locs(:)
 integer,                       intent(in)  :: base_type, loc_qtys(:)
 integer(i8),                   intent(in)  :: loc_indx(:)
-integer(i8),                   intent(out) :: num_close, close_ind(:)
+integer,                       intent(out) :: num_close, close_ind(:)
 real(r8),            optional, intent(out) :: dist(:)
 type(ensemble_type), optional, intent(in)  :: ens_handle
 
@@ -1428,7 +1428,7 @@
 type(get_close_type),          intent(in)  :: gc
 type(location_type),           intent(inout)  :: base_loc, locs(:)
 integer,                       intent(in)  :: base_type, loc_qtys(:)
-integer(i8),                   intent(out) :: num_close, close_ind(:)
+integer,                       intent(out) :: num_close, close_ind(:)
 real(r8),            optional, intent(out) :: dist(:)
 type(ensemble_type), optional, intent(in)  :: ens_handle
 

Modified: DART/branches/coamps/models/coamps_nest/externals/obs_def/obs_def_navdas_mod.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/externals/obs_def/obs_def_navdas_mod.f90	2019-07-23 22:45:08 UTC (rev 13204)
+++ DART/branches/coamps/models/coamps_nest/externals/obs_def/obs_def_navdas_mod.f90	2019-07-23 22:48:07 UTC (rev 13205)
@@ -248,7 +248,8 @@
     istatus(:) = 0
 
     ! Potential temperature at this location
-    call interpolate(state_handle, ens_size, location, QTY_POTENTIAL_TEMPERATURE, pot_t, this_istatus)
+    call interpolate(state_handle, ens_size, location, QTY_POTENTIAL_TEMPERATURE, &
+                      pot_t, this_istatus)
     call track_status(ens_size, this_istatus, t, istatus, return_now)
     if (return_now) return
     

Modified: DART/branches/coamps/models/coamps_nest/model_mod.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/model_mod.f90	2019-07-23 22:45:08 UTC (rev 13204)
+++ DART/branches/coamps/models/coamps_nest/model_mod.f90	2019-07-23 22:48:07 UTC (rev 13205)
@@ -683,8 +683,8 @@
           !                 obs_kind, obs_val, interp_worked)
           ! NEW:
           do i = 1, ens_size
-             call interpolate(state_handle, ens_size, i, domain, state_definition, location, &
-                              obs_kind, expected_obs(i), interp_status(i))
+             call interpolate(state_handle, ens_size, i, domain, state_definition, &
+                       location, obs_kind, expected_obs(i), interp_status(i))
           enddo
 
         end select
@@ -708,7 +708,7 @@
     type(location_type),           intent(inout)  :: base_loc, locs(:)
     integer,                       intent(in)  :: base_type, loc_qtys(:)
     integer(i8),                   intent(in)  :: loc_indx(:)
-    integer(i8),                   intent(out) :: num_close, close_ind(:)
+    integer,                       intent(out) :: num_close, close_ind(:)
     real(r8),            optional, intent(out) :: dist(:)
     type(ensemble_type), optional, intent(in)  :: ens_handle
     
@@ -741,8 +741,8 @@
     type(get_close_type),          intent(in)  :: gc
     type(location_type),           intent(inout) :: base_obs_loc, obs_locs(:)
     integer,                       intent(in)  :: base_obs_type, loc_qtys(:), loc_types(:)
-    integer(i8),                   intent(out) :: num_close
-    integer(i8),                   intent(out) :: close_ind(:)
+    integer,                       intent(out) :: num_close
+    integer,                       intent(out) :: close_ind(:)
     real(r8),            optional, intent(out) :: dist(:)
     type(ensemble_type), optional, intent(in)  :: ens_mean_handle