[Dart-dev] [4630] DART/trunk/models/POP: Removed unused variables from model_mod.f90,

[nancy at ucar.edu]

Revision: 4630
Author:   thoar
Date:     2011-01-05 09:30:40 -0700 (Wed, 05 Jan 2011)
Log Message:
-----------
Removed unused variables from model_mod.f90,
added support for sampling error correction use - that has been in common
use for a long time now.

Modified Paths:
--------------
    DART/trunk/models/POP/model_mod.f90
    DART/trunk/models/POP/shell_scripts/assimilate.csh

-------------- next part --------------
Modified: DART/trunk/models/POP/model_mod.f90
===================================================================
--- DART/trunk/models/POP/model_mod.f90	2011-01-05 16:27:16 UTC (rev 4629)
+++ DART/trunk/models/POP/model_mod.f90	2011-01-05 16:30:40 UTC (rev 4630)
@@ -15,7 +15,7 @@
 ! Modules that are absolutely required for use are listed
 use        types_mod, only : r4, r8, SECPERDAY, MISSING_R8, rad2deg, PI
 use time_manager_mod, only : time_type, set_time, set_date, get_date, get_time,&
-                             print_time, print_date, set_calendar_type,        &
+                             print_time, print_date,                           &
                              operator(*),  operator(+), operator(-),           &
                              operator(>),  operator(<), operator(/),           &
                              operator(/=), operator(<=)
@@ -226,7 +226,6 @@
 ! Called to do one time initialization of the model. In this case,
 ! it reads in the grid information.
 
-character(len=32):: calendar
 integer :: iunit, io
 integer :: ss, dd
 
@@ -938,7 +937,7 @@
 
 ! Local storage
 integer  :: lat_bot, lat_top, lon_bot, lon_top, num_inds, start_ind
-integer  :: x_ind, y_ind, i
+integer  :: x_ind, y_ind
 real(r8) :: p(4), x_corners(4), y_corners(4), xbot, xtop
 real(r8) :: lon_fract, lat_fract
 logical  :: masked
@@ -1121,7 +1120,7 @@
 integer,            intent(out) :: found_x, found_y, istatus
 
 ! Local storage
-integer  :: lon_status, lat_status, lon_top, lat_top
+integer  :: lat_status, lon_top, lat_top
 
 ! Succesful return has istatus of 0
 istatus = 0
@@ -1485,7 +1484,8 @@
 ! checks showed accuracy to seven decimal places on all tests.
 
 integer :: i
-real(r8) :: m(3, 3), v(3), r(3), a, x_corners(4), lon, lon_mean
+real(r8) :: m(3, 3), v(3), r(3), a, x_corners(4), lon
+! real(r8) :: lon_mean
 
 ! Watch out for wraparound on x_corners.
 lon = lon_in
@@ -2514,7 +2514,7 @@
 integer, dimension(NF90_MAX_VAR_DIMS) :: dimIDs
 character(len=NF90_MAX_NAME) :: varname 
 integer :: VarID, numdims, dimlen
-integer :: ncid, iyear, imonth, iday, ihour, iminute, isecond, nc_rc
+integer :: ncid, iyear, imonth, iday, ihour, iminute, isecond
 character(len=256) :: myerrorstring 
 
 if ( .not. module_initialized ) call static_init_model

Modified: DART/trunk/models/POP/shell_scripts/assimilate.csh
===================================================================
--- DART/trunk/models/POP/shell_scripts/assimilate.csh	2011-01-05 16:27:16 UTC (rev 4629)
+++ DART/trunk/models/POP/shell_scripts/assimilate.csh	2011-01-05 16:30:40 UTC (rev 4630)
@@ -71,12 +71,29 @@
       ${COPY}   ${DARTDIR}/${FILE} .
    else
       echo "DART required file $FILE not found ... ERROR"
-      stop
+      exit 1
    endif
 
 end
 
 #-------------------------------------------------------------------------
+# This is the file for the sampling error correction.
+# Each ensemble size has its own file.
+# It is static - it does not need to be archived, etc.
+# It is only needed if 
+# input.nml:&assim_tools_nml:sampling_error_correction = .true.,
+#-------------------------------------------------------------------------
+
+set SAMP_ERR_FILE = ${DARTDIR}/system_simulation/final_full.${ensemble_size}
+
+if ( -e ${SAMP_ERR_FILE}/ ) then
+   ${COPY} ${SAMP_ERR_FILE} .
+else
+   echo "WARNING: no sampling error correction file for this ensemble size."
+   echo "warning: looking for system_simulation/final_full.${ensemble_size}"
+endif
+
+#-------------------------------------------------------------------------
 # DART INFLATION BLOCK
 # This file is only relevant if 'inflation' is turned on -
 # i.e. if inf_flavor(1) /= 0 - AND we are in a 'restart' mode.