[Dart-dev] [5844] DART/branches/development/models/noah: Removed some debug statements and better staging of the TRUTH file.
nancy at ucar.edu
nancy at ucar.edu
Thu Aug 16 14:05:42 MDT 2012
Revision: 5844
Author: thoar
Date: 2012-08-16 14:05:42 -0600 (Thu, 16 Aug 2012)
Log Message:
-----------
Removed some debug statements and better staging of the TRUTH file.
Modified Paths:
--------------
DART/branches/development/models/noah/model_mod.f90
DART/branches/development/models/noah/noah_to_dart.f90
DART/branches/development/models/noah/shell_scripts/setup_pmo.csh
DART/branches/development/models/noah/work/input.nml
-------------- next part --------------
Modified: DART/branches/development/models/noah/model_mod.f90
===================================================================
--- DART/branches/development/models/noah/model_mod.f90 2012-08-16 18:54:13 UTC (rev 5843)
+++ DART/branches/development/models/noah/model_mod.f90 2012-08-16 20:05:42 UTC (rev 5844)
@@ -318,10 +318,10 @@
! FIXME ... make sure model_time_step is attainable given OUTPUT_TIMESTEP
model_time_step = set_time(assimilation_period_seconds, assimilation_period_days)
-if ( debug > 0 ) then
- call print_date(model_time ,'static_init_model:model date')
- call print_time(model_time ,'static_init_model:model time')
- call print_time(model_time_step,'static_init_model:model timestep')
+if (do_output()) then
+ call print_date(model_time ,' static_init_model:model date')
+ call print_time(model_time ,' static_init_model:model time')
+ call print_time(model_time_step,' static_init_model:model timestep')
endif
! Make sure the number of soil layers is as we expect
@@ -641,13 +641,11 @@
else
! This assumes the soil layer has a constant value.
DEPTH : do n = 1,nsoil
- write(*,*)'model_interpolate comparing zsoil(n)',zsoil(n),' to observation depth',loc_depth
if (loc_depth >= zsoil(n)) then
zlev = n
exit DEPTH
endif
enddo DEPTH
- write(*,*)'model_interpolate zsoil(n)',zsoil(n),' matches observation depth',loc_depth
indx = progvar(ivar)%index1 + zlev - 1
endif
@@ -1471,7 +1469,7 @@
! Record the contents of the DART state vector
- if ( debug > 3 ) then
+ if (do_output()) then
write(logfileunit,*)'variable ',i,' is ',trim(table(i,1)), ' ', trim(table(i,2))
write( * ,*)'variable ',i,' is ',trim(table(i,1)), ' ', trim(table(i,2))
endif
@@ -2033,8 +2031,8 @@
enddo
-if ( debug > 7 ) write(*,*)'TJH DEBUG get_hrldas_constants ncstart is',ncstart(1:numdims)
-if ( debug > 7 ) write(*,*)'TJH DEBUG get_hrldas_constants nccount is',nccount(1:numdims)
+if ( debug > 99 ) write(*,*)'TJH DEBUG get_hrldas_constants ncstart is',ncstart(1:numdims)
+if ( debug > 99 ) write(*,*)'TJH DEBUG get_hrldas_constants nccount is',nccount(1:numdims)
! finally get the longitudes
@@ -2053,8 +2051,7 @@
start=ncstart(1:numdims), count=nccount(1:numdims)), &
'get_hrldas_constants', 'get_var XLAT '//trim(filename))
-! FIXME
-write(string1,*) 'get_hrldas_constants not written yet.'
+write(string1,*) 'get_hrldas_constants() not verified for full 2D scenario.'
call error_handler(E_MSG,'static_init_model',string1,source,revision,revdate)
end subroutine get_hrldas_constants
Modified: DART/branches/development/models/noah/noah_to_dart.f90
===================================================================
--- DART/branches/development/models/noah/noah_to_dart.f90 2012-08-16 18:54:13 UTC (rev 5843)
+++ DART/branches/development/models/noah/noah_to_dart.f90 2012-08-16 20:05:42 UTC (rev 5844)
@@ -27,7 +27,8 @@
use types_mod, only : r8
use utilities_mod, only : initialize_utilities, timestamp, &
- find_namelist_in_file, check_namelist_read
+ find_namelist_in_file, check_namelist_read, &
+ logfileunit, do_output
use model_mod, only : get_model_size, noah_to_dart_vector, &
get_noah_restart_filename
use assim_model_mod, only : awrite_state_restart, open_restart_write, close_restart
@@ -73,10 +74,16 @@
call get_noah_restart_filename( noah_restart_filename )
-write(*,*)
-write(*,'(''noah_to_dart:converting noah restart file '',A, &
+if (do_output()) then
+ write(*,*)
+ write(*,'(''noah_to_dart:converting noah restart file '',A, &
&'' to DART file '',A)') &
trim(noah_restart_filename), trim(noah_to_dart_output_file)
+ write(logfileunit,*)
+ write(logfileunit,'(''noah_to_dart:converting noah restart file '',A, &
+ &'' to DART file '',A)') &
+ trim(noah_restart_filename), trim(noah_to_dart_output_file)
+endif
!----------------------------------------------------------------------
! get to work
@@ -96,8 +103,13 @@
! When called with 'end', timestamp will call finalize_utilities()
!----------------------------------------------------------------------
-call print_date(model_time, str='noah_to_dart:DART model date')
-call print_time(model_time, str='noah_to_dart:DART model time')
+if (do_output()) then
+ call print_date(model_time, str='noah_to_dart:DART model date',iunit=logfileunit)
+ call print_date(model_time, str='noah_to_dart:DART model date')
+ call print_time(model_time, str='noah_to_dart:DART model time')
+ call print_time(model_time, str='noah_to_dart:DART model time',iunit=logfileunit)
+endif
+
call timestamp(string1=source, pos='end')
end program noah_to_dart
Modified: DART/branches/development/models/noah/shell_scripts/setup_pmo.csh
===================================================================
--- DART/branches/development/models/noah/shell_scripts/setup_pmo.csh 2012-08-16 18:54:13 UTC (rev 5843)
+++ DART/branches/development/models/noah/shell_scripts/setup_pmo.csh 2012-08-16 20:05:42 UTC (rev 5844)
@@ -33,26 +33,27 @@
set DARTDIR = /Users/thoar/svn/DART/devel/models/noah
${COPY} ${NOAHDIR}/Run/wrfinput.template wrfinput || exit 1
-${COPY} ${NOAHDIR}/Run/namelist.hrldas . || exit 1
${COPY} ${NOAHDIR}/Run/Noah_hrldas_beta . || exit 1
${COPY} ${NOAHDIR}/Run/SOILPARM.TBL . || exit 1
${COPY} ${NOAHDIR}/Run/VEGPARM.TBL . || exit 1
${COPY} ${NOAHDIR}/Run/GENPARM.TBL . || exit 1
${COPY} ${NOAHDIR}/Run/URBPARM.TBL . || exit 1
-${COPY} ${DARTDIR}/work/obs_seq.in . || exit 2
-${COPY} ${DARTDIR}/work/input.nml . || exit 2
-${COPY} ${DARTDIR}/work/perfect_model_obs . || exit 2
-${COPY} ${DARTDIR}/work/dart_to_noah . || exit 2
-${COPY} ${DARTDIR}/work/noah_to_dart . || exit 2
-${COPY} ${DARTDIR}/shell_scripts/run_pmo.csh . || exit 2
-${COPY} ${DARTDIR}/shell_scripts/advance_model.csh . || exit 2
+${COPY} ${DARTDIR}/work/namelist.hrldas . || exit 2
+${COPY} ${DARTDIR}/work/obs_seq.in . || exit 3
+${COPY} ${DARTDIR}/work/input.nml . || exit 3
+${COPY} ${DARTDIR}/work/perfect_model_obs . || exit 3
+${COPY} ${DARTDIR}/work/dart_to_noah . || exit 3
+${COPY} ${DARTDIR}/work/noah_to_dart . || exit 3
+${COPY} ${DARTDIR}/shell_scripts/run_pmo.csh . || exit 3
+${COPY} ${DARTDIR}/shell_scripts/advance_model.csh . || exit 3
+
# need a single noah restart file to be used as THE TRUTH.
# the input.nml:model_nml noah_netcdf_filename = 'restart.nc'
# the assimilate.csh scripts wants an ensemble member node
-ln -sv ${NOAHDIR}/Run/hourly_output/RESTART.2004010107_DOMAIN1 restart.nc
+${COPY} ${NOAHDIR}/Run/hourly_output/RESTART.2004010107_DOMAIN1 restart.nc
ln -sv restart.nc restart.0001.nc
./noah_to_dart || exit 3
Modified: DART/branches/development/models/noah/work/input.nml
===================================================================
--- DART/branches/development/models/noah/work/input.nml 2012-08-16 18:54:13 UTC (rev 5843)
+++ DART/branches/development/models/noah/work/input.nml 2012-08-16 20:05:42 UTC (rev 5844)
@@ -137,8 +137,8 @@
/
&obs_kind_nml
- assimilate_these_obs_types = 'COSMOS_NEUTRON_INTENSITY',
- evaluate_these_obs_types = 'SOIL_TEMPERATURE',
+ assimilate_these_obs_types = 'SOIL_TEMPERATURE',
+ evaluate_these_obs_types = 'COSMOS_NEUTRON_INTENSITY',
/
&preprocess_nml
More information about the Dart-dev
mailing list