[Dart-dev] DART/branches Revision: 11954

[dart at ucar.edu]

thoar at ucar.edu
2017-09-25 14:38:57 -0600 (Mon, 25 Sep 2017)
148
replacing the copyright tags and svn info.
removing (again) the unused variables and added missing
'private' tags and companion 'public' routines.




Modified: DART/branches/mizzi/obs_def/obs_def_AIRNOW_OBS_mod.f90
===================================================================
--- DART/branches/mizzi/obs_def/obs_def_AIRNOW_OBS_mod.f90	2017-09-21 23:00:59 UTC (rev 11953)
+++ DART/branches/mizzi/obs_def/obs_def_AIRNOW_OBS_mod.f90	2017-09-25 20:38:57 UTC (rev 11954)
@@ -2,7 +2,7 @@
 ! provided by UCAR, "as is", without charge, subject to all terms of use at
 ! http://www.image.ucar.edu/DAReS/DART/DART_download
 !
-! $Id$
+! DART $Id$
 
 ! BEGIN DART PREPROCESS KIND LIST
 ! AIRNOW_CO,                       KIND_CO,                     COMMON_CODE

Modified: DART/branches/mizzi/obs_def/obs_def_CO_Nadir_mod.f90
===================================================================
--- DART/branches/mizzi/obs_def/obs_def_CO_Nadir_mod.f90	2017-09-21 23:00:59 UTC (rev 11953)
+++ DART/branches/mizzi/obs_def/obs_def_CO_Nadir_mod.f90	2017-09-25 20:38:57 UTC (rev 11954)
@@ -2,7 +2,7 @@
 ! provided by UCAR, "as is", without charge, subject to all terms of use at
 ! http://www.image.ucar.edu/DAReS/DART/DART_download
 !
-! $Id$
+! DART $Id$
 
 
 ! BEGIN DART PREPROCESS KIND LIST
@@ -65,11 +65,15 @@
 use  assim_model_mod, only : interpolate
 use    obs_kind_mod, only  : KIND_CO, KIND_PRESSURE, KIND_SURFACE_PRESSURE
 
-
 implicit none
+private
 
-public :: write_mopitt_co, read_mopitt_co, interactive_mopitt_co, &
-          get_expected_mopitt_co, get_expected_iasi_co, set_obs_def_mopitt_co
+public :: write_mopitt_co, &
+          read_mopitt_co, &
+          interactive_mopitt_co, &
+          get_expected_mopitt_co, &
+          get_expected_iasi_co, &
+          set_obs_def_mopitt_co
 
 ! Storage for the special information required for observations of this type
 integer, parameter               :: max_mopitt_co_obs = 10000000
@@ -85,9 +89,6 @@
 real(r8), dimension(max_mopitt_co_obs)	 :: mopitt_psurf	
 integer,  dimension(max_mopitt_co_obs)   :: mopitt_nlevels
 
-! For now, read in all info on first read call, write all info on first write call
-logical :: already_read = .false., already_written = .false.
-
 ! version controlled file description for error handling, do not edit
 character(len=256), parameter :: source   = &
    "$URL$"
@@ -120,6 +121,7 @@
 integer, intent(out)            :: key
 integer, intent(in)             :: ifile
 character(len=*), intent(in), optional    :: fform
+
 character(len=32) 		:: fileformat
 
 integer			:: mopitt_nlevels_1
@@ -253,15 +255,14 @@
 integer, intent(out)            :: istatus
 integer :: i,j
 integer :: num_levs, lev
-type(location_type) :: loc1,loc2,loc3,loc3p,loc3m,locS
-real(r8)            :: mloc(3), mloc1(3), mloc2(3)
-real(r8)            :: obs_val, pres, surf_pres, obs_val_int
+type(location_type) :: loc3,locS
+real(r8)            :: mloc(3)
+real(r8)            :: obs_val, obs_val_int
 real(r8)            :: top_pres, bot_pres, coef, mop_layer_wght
-real(r8)            :: i_top_pres, i_bot_pres, i_pres
+real(r8)            :: i_top_pres, i_bot_pres
 real(r8)            :: p_col(max_model_levs)
 real(r8)            :: mopitt_pres_local(mopitt_dim)
 integer             :: nlevels, start_i, end_i
-integer,  allocatable :: dim_sizes(:)
 
 if ( .not. module_initialized ) call initialize_module
 val = 0.0_r8
@@ -378,18 +379,17 @@
 integer, intent(out)            :: istatus
 
 integer :: i,j
-type(location_type) :: loc1,loc2,loc3,loc3p,loc3m,locS
-real(r8)            :: mloc(3), mloc1(3), mloc2(3)
-real(r8)	    :: obs_val, pres, obs_val_int
+type(location_type) :: loc3,locS
+real(r8)            :: mloc(3)
+real(r8)            :: obs_val, obs_val_int
 
 integer             :: nlevels, start_i, end_i
 
 real(r8)            :: top_pres, bot_pres, coef, mop_layer_wght
-real(r8)            :: i_top_pres, i_bot_pres, i_pres
+real(r8)            :: i_top_pres, i_bot_pres
 integer             :: num_levs, lev