[Dart-dev] DART/branches Revision: 11900

[dart at ucar.edu]

hendric at ucar.edu
2017-08-15 17:18:26 -0600 (Tue, 15 Aug 2017)
80
general clean up of model_mod.f90.  removing subroutines
print statements, ...




Modified: DART/branches/rma_fix_clm_restarts/models/clm/model_mod.f90
===================================================================
--- DART/branches/rma_fix_clm_restarts/models/clm/model_mod.f90	2017-08-14 16:40:36 UTC (rev 11899)
+++ DART/branches/rma_fix_clm_restarts/models/clm/model_mod.f90	2017-08-15 23:18:26 UTC (rev 11900)
@@ -1518,7 +1518,7 @@
 real(r8), allocatable, dimension(:,:)       :: data_2d_array
 real(r8), allocatable, dimension(:,:,:)     :: data_3d_array
 
-integer :: io, ncid_in, ncid_dart, var_id_out, TimeDimID, VarID, ncNdims, dimlen, numvars
+integer :: io, ncid_clm, ncid_dart, var_id_out, TimeDimID, VarID, ncNdims, dimlen, numvars
 integer, dimension(NF90_MAX_VAR_DIMS) :: dimIDs
 character     (len=NF90_MAX_NAME)     :: varname
 character     (len=256)               :: myerrorstring
@@ -1544,19 +1544,19 @@
 ! time of restart file
 
 allocate(snlsno(ncolumn))
-call nc_check(nf90_open(trim(clm_restart_filename), NF90_NOWRITE, ncid_in), &
+call nc_check(nf90_open(trim(clm_restart_filename), NF90_NOWRITE, ncid_clm), &
               'clm_to_dart_state_vector', 'open SNLSNO'//clm_restart_filename)
-call nc_check(nf90_inq_varid(ncid_in,'SNLSNO', VarID), &
+call nc_check(nf90_inq_varid(ncid_clm,'SNLSNO', VarID), &
               'clm_to_dart_state_vector', 'inq_varid SNLSNO'//clm_restart_filename)
-call nc_check(nf90_get_var(ncid_in, VarID, snlsno), &
+call nc_check(nf90_get_var(ncid_clm, VarID, snlsno), &
               'clm_to_dart_state_vector', 'get_var SNLSNO'//clm_restart_filename)
 
-restart_time = get_state_time(ncid_in)
+restart_time = get_state_time(ncid_clm)
 
 if (do_output()) call print_time(restart_time,'time in restart file '//clm_restart_filename)
 if (do_output()) call print_date(restart_time,'date in restart file '//clm_restart_filename)
 
-call nc_check(nf90_close(ncid_in),'clm_to_dart_state_vector','close '//clm_restart_filename)
+call nc_check(nf90_close(ncid_clm),'clm_to_dart_state_vector','close '//clm_restart_filename)
 
 ! open an existing netcdf file that has is a copy of clm_restart_filename
 ! to fill in missing_r8 values.
@@ -1575,16 +1575,16 @@
 
    varname = trim(progvar(ivar)%varname)
    myerrorstring = trim(progvar(ivar)%origin)//' '//trim(progvar(ivar)%varname)
-   call nc_check(nf90_open(trim(clm_restart_filename), NF90_NOWRITE, ncid_in), &
+   call nc_check(nf90_open(trim(clm_restart_filename), NF90_NOWRITE, ncid_clm), &
               'clm_to_dart_state_vector','open '//trim(myerrorstring))
 
    ! File is not required to have a time dimension
-   io = nf90_inq_dimid(ncid_in, 'time', TimeDimID)
+   io = nf90_inq_dimid(ncid_clm, 'time', TimeDimID)
    if (io /= NF90_NOERR) TimeDimID = MISSING_I
 
-   call nc_check(nf90_inq_varid(ncid_in,   varname, VarID), &
+   call nc_check(nf90_inq_varid(ncid_clm,   varname, VarID), &
             'clm_to_dart_state_vector', 'inq_varid input '//trim(myerrorstring))
-   call nc_check(nf90_inquire_variable( ncid_in, VarID, dimids=dimIDs, ndims=ncNdims), &
+   call nc_check(nf90_inquire_variable( ncid_clm, VarID, dimids=dimIDs, ndims=ncNdims), &
                  'clm_to_dart_state_vector', 'inquire_variable '//trim(myerrorstring))
 
    call nc_check(nf90_inq_varid(ncid_dart,   varname, var_id_out), &
@@ -1606,7 +1606,7 @@
    do i = 1,progvar(ivar)%numdims
 
       write(string1,'(''inquire dimension'',i2,A)') i,trim(myerrorstring)
-      call nc_check(nf90_inquire_dimension(ncid_in, dimIDs(i), len=dimlen), &
+      call nc_check(nf90_inquire_dimension(ncid_clm, dimIDs(i), len=dimlen), &
             'clm_to_dart_state_vector', string1)
 
       ! Time dimension will be 1 in progvar, but not necessarily
@@ -1636,7 +1636,7 @@
 
       ni = progvar(ivar)%dimlens(1)
       allocate(data_1d_array(ni))
-      call DART_get_var(ncid_in, varname, data_1d_array)
+      call DART_get_var(ncid_clm, varname, data_1d_array)
 
       call nc_check(nf90_put_var(ncid_dart, var_id_out, data_1d_array), &
                    'nc_write_model_atts', 'put_var '//trim(varname))
@@ -1648,7 +1648,7 @@
       ni = progvar(ivar)%dimlens(1)
       nj = progvar(ivar)%dimlens(2)
       allocate(data_2d_array(ni, nj))
-      call DART_get_var(ncid_in, varname, data_2d_array)
+      call DART_get_var(ncid_clm, varname, data_2d_array)
 
       ! README: The values in unused snow layers must be assumed to be
       ! indeterminate. If the layer is not in use, fill with a missing value.
@@ -1729,7 +1729,7 @@
        ! nk = progvar(ivar)%dimlens(3) not needed ... time is always a singleton
 
          allocate(data_3d_array(ni, nj, 1))
-         call DART_get_var(ncid_in, varname, data_3d_array)
+         call DART_get_var(ncid_clm, varname, data_3d_array)
 
          ! In the CLM history files, the _missing_value_ flag seems to be
          ! applied correctly for PBOT, TBOT ... so there is no need for the
@@ -1766,8 +1766,8 @@
    !                      source,revision,revdate,text2=string2)
    ! endif
 
-   call nc_check(nf90_close(ncid_in),'clm_to_dart_state_vector','close in'//progvar(ivar)%origin)
-   ncid_in = 0