[Dart-dev] DART/branches Revision: 11644

[dart at ucar.edu]

thoar at ucar.edu
2017-05-18 11:15:40 -0600 (Thu, 18 May 2017)
563
All programs compile.
Unused variables removed from model_mod.f90
Added 'intent' statements to some interfaces that did not have them.
Removed an unused 'scopy' routine.
Removed the call to ran_init() as it is no longer needed.
Removed the random_nr_mod.f90 from the path_names files and sorted.
Committed the null_mpi versions.
Removed the cov_cutoff_mod.f90 from path_names that did not need it.

The trans_time.f90 routine did not compile under gfortran.
This is straight from the trunk (!?).
It broke on the format for printing a blank line ... good grief. 




Modified: DART/branches/LMDZ_trunk/models/LMDZ/model_mod.f90
===================================================================
--- DART/branches/LMDZ_trunk/models/LMDZ/model_mod.f90	2017-05-17 17:47:37 UTC (rev 11643)
+++ DART/branches/LMDZ_trunk/models/LMDZ/model_mod.f90	2017-05-18 17:15:40 UTC (rev 11644)
@@ -99,7 +99,7 @@
 use     obs_kind_mod, only : KIND_U_WIND_COMPONENT, KIND_V_WIND_COMPONENT,KIND_PRESSURE,         &
                              KIND_SURFACE_PRESSURE, KIND_TEMPERATURE,KIND_SPECIFIC_HUMIDITY,     &
                              KIND_CLOUD_LIQUID_WATER, KIND_SURFACE_ELEVATION
-use    random_nr_mod, only : init_ran1
+!use    random_nr_mod, only : init_ran1
 use   random_seq_mod, only : random_seq_type, init_random_seq, random_gaussian
 
 ! end of use statements
@@ -129,11 +129,8 @@
 !----------------------------------------------------------------------------
 
 ! version controlled file description for error handling, do not edit
-character(len=128), parameter :: &
-
-! version controlled file description for error handling, do not edit
 character(len=256), parameter :: source   = &
-   '$URL$', &
+   '$URL$'
 character(len=32 ), parameter :: revision = '$Revision$'
 character(len=128), parameter :: revdate  = '$Date$'
 
@@ -159,9 +156,6 @@
            TYPE_CLDLIQ = MISSING_I
 !-----------------------------------------------------------------------
 
-type(time_type)                  :: time_step
-type(location_type), allocatable :: state_loc(:)
-
 ! temporary output
 integer :: num_calced = 0, num_searched = 0
 
@@ -216,7 +210,7 @@
 ! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --
 ! Random sequence and init for pert_model_state
 logical                 :: first_pert_call = .true.
-type(random_seq_type)   :: random_seq
+
 ! Variable for keeping track of which ensemble member is to be perturbed
 ! by pert_model_state, which is called by filter for each ensemble member
 ! for a cold start.
@@ -226,7 +220,7 @@
 logical                 :: do_out
 
 ! common message string used by many subroutines
-character(len=150)               :: msgstring, string2
+character(len=512)               :: msgstring
 !----
 character (len=8), allocatable   :: cflds(:)
 integer                          :: nflds         ! # fields to read
@@ -349,10 +343,8 @@
 ! spherical harmonic weights, these would also be computed here.
 ! Can be a NULL INTERFACE for the simplest models.
 
- real(r8)        :: x_loc
- integer         :: i, j, iunit, io, ncfileid
+ integer         :: iunit, io, ncfileid
  integer         :: max_levs, topog_lons, topog_lats
- type(time_type) :: model_time 
 
 !------------------------------------------------------------------
 ! only execute this code once
@@ -564,35 +556,33 @@
     temps%length    = 1
 
     write(*,"(A10,I3)") slon%var_name , slon%length
-    write(*,"(A10,I3)") lat%var_name , lat%length
-    write(*,"(A10,I3)") lon%var_name , lon%length
+    write(*,"(A10,I3)")  lat%var_name ,  lat%length
+    write(*,"(A10,I3)")  lon%var_name ,  lon%length
     write(*,"(A10,I3)") slat%var_name , slat%length
-    write(*,"(A10,I3)") sigs%var_name  , sigs%length
-    write(*,"(A10,I3)") sig%var_name   , sig%length
+    write(*,"(A10,I3)") sigs%var_name , sigs%length
+    write(*,"(A10,I3)")  sig%var_name ,  sig%length
 
 end subroutine
 
+!-----------------------------------------------------------------------
+!>
 
 subroutine read_lmdz_coord(ncfileid, var, cfield)
-!=======================================================================
-integer,            intent(in)  :: ncfileid   ! file and field IDs
+integer,            intent(in)  :: ncfileid
+type(grid_1d_type), intent(out) :: var
 character (len=8),  intent(in)  :: cfield
-type(grid_1d_type), intent(out) :: var
-!-----------
-!----------------------------------------------------------------------
+
 ! Local workspace
-integer :: i, coord_size             ! grid/array indices
-integer :: ncfldid    ! file and field IDs
-integer :: ncerr      ! other nc errors; don't abort
+integer :: i
+integer :: ncfldid