[Dart-dev] DART/branches Revision: 11470

[dart at ucar.edu]

thoar at ucar.edu
2017-04-12 19:03:50 -0600 (Wed, 12 Apr 2017)
97
This was called model_mod.f90.TheLatestVersion111914
which I think means it was from 2014-11-19




Modified: DART/branches/Tb/models/clm/model_mod.f90
===================================================================
--- DART/branches/Tb/models/clm/model_mod.f90	2017-04-13 01:02:56 UTC (rev 11469)
+++ DART/branches/Tb/models/clm/model_mod.f90	2017-04-13 01:03:50 UTC (rev 11470)
@@ -171,14 +171,14 @@
 character(len=256) :: clm_history_filename = 'clm_history.nc'
 character(len=256) :: clm_vector_history_filename = 'clm_vector_history.nc'
 character(len=256) :: casename = 'clm_dart'
-character(len=256) :: surfpara_nc= 'Yangpara_0.9x1.25_c140822.nc'
-character(len=256) :: lai_nc = 'LAI_GLASS.nc'
+character(len=256) :: auxiliary_nc= '../rtm_auxiliary.nc'
+character(len=256) :: lai_nc = '../rtm_lai_modis.nc'
 
 character(len=obstypelength) :: clm_variables(max_state_variables*num_state_table_columns) = ' '
 
 namelist /model_nml/            &
    casename,                    &
-   surfpara_nc,                 & 
+   auxiliary_nc,                & 
    lai_nc,                      &
    clm_restart_filename,        &
    clm_history_filename,        &
@@ -225,27 +225,6 @@
 !----------------------------------------------------------------------
 ! Properties required for a snow column
 !----------------------------------------------------------------------
-
-
-type soilprops
-   private
-   integer  :: nlayers  ! snow layers
-   real(r4) :: ssm      ! aux_ins(1) surface soil moisture [m3m-3]
-   real(r4) :: stg      ! aux_ins(2) surface layer temperature [k]
-   real(r4) :: stv      ! aux_ins(3) ground vegetation temperature [K]  
-   real(r4) :: sat      ! aux_ins(4) topsoil porosity (0~1)
-   real(r4) :: ssand    ! aux_ins(5) soil sand content percentage (0~100)
-   real(r4) :: sclay    ! aux_ins(6) soil clay content percentage (0~100)
-   real(r4) :: lai      ! aux_ins(7) MODIS (GLASS) leaf area index
-   real(r4) :: fmv      ! aux_ins(8) coefficient f in calculating vegetation water content
-   real(r4) :: bmv      ! aux_ins(9) coefficient in calculating Tao
-   real(r4) :: xmv      ! aux_ins(10) coefficient in calculating Tao
-   real(r4) :: qmv      ! aux_ins(11) surface roughness parameters
-   real(r4) :: hmv      ! aux_ins(12) surface roughness parameters
-end type soilprops
-
-type(soilprops) :: soilcolumn
-
 type snowprops
    private
    integer  :: nlayers         ! aux_ins(1)
@@ -2478,7 +2457,7 @@
    endif
 elseif (obs_kind == KIND_BRIGHTNESS_TEMPERATURE ) then
    if (present(optionals)) then
-      call get_brightness_temperature(model_time, location, optionals, interp_val, istatus)
+      call get_brightness_temperature_new(x, model_time, location, optionals, interp_val, istatus)
    else
       write(string1, '(''Tb obs at lon,lat ('',f12.6,'','',f12.6,'') has no metadata.'')') &
                                   llon, llat
@@ -2773,7 +2752,7 @@
 enddo GRIDCELL
 
 if ( (counter1+counter2) == 0 ) then
-   if ((debug > 1) .and. do_output()) then
+   if ((debug > 0) .and. do_output()) then
       write(string1, *)'statevector variable '//trim(varstring)//' had no viable data'
       write(string2, *)'at gridcell lon/lat = (',gridloni,',',gridlatj,')'
       write(string3, *)'obs lon/lat/lev (',loc_lon,',',loc_lat,',',loc_lev,')'
@@ -4919,15 +4898,13 @@
 
 
 
-subroutine get_brightness_temperature(state_time, location, metadata, obs_val, istatus)
-
+!===========================================================================================Long
+subroutine get_brightness_temperature_new(x, state_time, location, metadata, obs_val, istatus)
 ! This is THE forward observation operator. Given the state and a location, return the value
-! The parts of the state required for this forward operator are not required to
-! be part of the DART state vector. They are currently directly harvested from the CLM
-! restart file. As such, the posteriors are not informative.
 
 use   radiative_transfer_mod, only : forward_Qh
 
+real(r8),               intent(in)  :: x(:)            ! state vector
 type(time_type),        intent(in)  :: state_time      ! valid time of DART state
 type(location_type),    intent(in)  :: location        ! observation location
 real(r8), dimension(:), intent(in)  :: metadata
@@ -4936,29 +4913,21 @@
 
 integer,  parameter :: N_FREQ = 1  ! observations come in one frequency at a time
 integer,  parameter :: N_POL  = 2  ! code automatically computes both polarizations
-real(r8), parameter :: density_h2o = 1000.0_r8 ! Water density Kg/m3
 
 ! variables required by forward_wg() routine
 
-real(r4) :: aux_ins(12)     ! [surface_sm, ground_T, porosity, %sand, %clay, 'g']
+real(r8) :: aux_ins(12)    ! [surface_sm, ground_T, porosity, %sand, %clay, 'g']
+real(r4) :: aux_ins_in(12)
 real(r4) :: freq( N_FREQ)  ! frequencies at which calculations are to be done
 real(r4) :: tetad(N_FREQ)  ! incidence angle of satellite
 real(r4) :: tb_out(N_POL,N_FREQ) ! calculated brightness temperature - output