[Dart-dev] DART/branches Revision: 12774

[dart at ucar.edu]

thoar at ucar.edu
2018-08-14 10:21:44 -0600 (Tue, 14 Aug 2018)
118
removed the last vestige of a conflict resolution from the obs_seq.out
using explicit syntax for real(r8) constants.




Modified: DART/branches/yz-cice/models/cice/work/obs_seq.out
===================================================================
--- DART/branches/yz-cice/models/cice/work/obs_seq.out	2018-08-13 23:40:27 UTC (rev 12773)
+++ DART/branches/yz-cice/models/cice/work/obs_seq.out	2018-08-14 16:21:44 UTC (rev 12774)
@@ -85048,7 +85048,3 @@
            1
      0     146128
   2.250000000000000E-002
-=======
-     0     146128
-   2.0000000000000000E-003
->>>>>>> .r12365

Modified: DART/branches/yz-cice/observations/forward_operators/obs_def_cice_mod.f90
===================================================================
--- DART/branches/yz-cice/observations/forward_operators/obs_def_cice_mod.f90	2018-08-13 23:40:27 UTC (rev 12773)
+++ DART/branches/yz-cice/observations/forward_operators/obs_def_cice_mod.f90	2018-08-14 16:21:44 UTC (rev 12774)
@@ -121,6 +121,7 @@
 logical, save :: module_initialized = .false.
 
 contains
+
 !---------------------------------------------------------------------
 
 subroutine initialize_module
@@ -152,11 +153,11 @@
 integer      :: icat,Ncat
 integer      :: istatus1(ens_size),istatus2(ens_size),istatus3(ens_size)
 
-type(location_type) :: location_fake   ! model_interpolate interpolates from the model grid to a specific location
-                                       ! the 3rd varialbe location%z contains cat_index. The observation itself may 
-                                       ! not contain cat_index, so we need create one.
+type(location_type) :: location_fake ! model_interpolate interpolates from the model grid to a specific location
+                                     ! the 3rd varialbe location%z contains cat_index. The observation itself may 
+                                     ! not contain cat_index, so we need create one.
 
-real(r8),parameter :: ice_dens = 917_r8, snow_dens = 330_r8, water_dens = 1026_r8
+real(r8),parameter :: ice_dens = 917.0_r8, snow_dens = 330.0_r8, water_dens = 1026.0_r8
 
 loc_array = get_location(location)
 llat = loc_array(1)
@@ -164,8 +165,8 @@
 if (.not.module_initialized) call initialize_module
 
 istatus = 0
-fb_volume = 0
-agreg_fb  = 0
+fb_volume = 0.0_r8
+agreg_fb  = 0.0_r8
 call get_ncat_dim(Ncat)
 
 call get_expected_agreg_over_grid(state_handle,ens_size,location,QTY_SEAICE_CONCENTR,agreg_sic,istatus3)
@@ -186,6 +187,7 @@
 where(istatus3/=0) istatus = istatus3
 
 end subroutine get_expected_agreg_freeboard
+
 !------------------------------------------------------------------------------------------
 ! The forward operator is to sum the model state over all the categories, unit per grid area
 ! Nothing else is applied.
@@ -217,7 +219,7 @@
 istatus = 0
 
 call get_ncat_dim(Ncat)
-agreg_grid = 0
+agreg_grid = 0.0_r8
 
 do icat = 1, Ncat
    location_fake = set_location(llat,llon,real(icat,r8),VERTISLEVEL)  !the cat index needs to be icat