[Dart-dev] [6082] DART/branches/development/models: A collection of benign changes.
nancy at ucar.edu
nancy at ucar.edu
Wed Apr 24 21:20:00 MDT 2013
Revision: 6082
Author: thoar
Date: 2013-04-24 21:19:58 -0600 (Wed, 24 Apr 2013)
Log Message:
-----------
A collection of benign changes.
1) In the CAM files, replaced the filename of 'temp_ic' with 'dart_restart'
(trying to move to dart_ics and dart_restart to make documentation easier)
2) At the end of each shell script, I have the exit with a status
and the SVN keyword block.
3) In the scripts, added "set nonomatch" to make 'rm' behave more nicely when it
does not match a wildcard pattern.
Modified Paths:
--------------
DART/branches/development/models/cam/clm_ens_avg.f90
DART/branches/development/models/cam/column_rand.f90
DART/branches/development/models/cam/full_experiment/job_mpi.csh
DART/branches/development/models/cam/perfect_model/pmo.csh
DART/branches/development/models/cam/shell_scripts/CESM_setup_startup_hopper.csh
DART/branches/development/models/cam/shell_scripts/CESM_setup_zagar.csh
DART/branches/development/models/cam/shell_scripts/CESM_setup_zagar_pmo.csh
DART/branches/development/models/cam/shell_scripts/advance_model.retry.csh
DART/branches/development/models/cam/shell_scripts/assimilate.Fzagar.csh
DART/branches/development/models/cam/shell_scripts/assimilate.hopper.csh
DART/branches/development/models/cam/shell_scripts/assimilate.ned.csh
DART/branches/development/models/cam/shell_scripts/assimilate.zagar.csh
DART/branches/development/models/cam/shell_scripts/input.normal.nml
DART/branches/development/models/cam/shell_scripts/input.pert0.nml
DART/branches/development/models/cam/shell_scripts/job.simple.csh
DART/branches/development/models/cam/shell_scripts/pmo.ned.csh
DART/branches/development/models/cam/shell_scripts/setup_cesm_case.hopper.csh
DART/branches/development/models/cam/shell_scripts/setup_cesm_case.ned.csh
DART/branches/development/models/cam/shell_scripts/setup_cesm_case.pmo.csh
DART/branches/development/models/cam/work/input_1.nml
DART/branches/development/models/cam/work/input_capt.nml
DART/branches/development/models/cam/work/input_n.nml
DART/branches/development/models/clm/shell_scripts/CESM_setup_bluefire.csh
DART/branches/development/models/clm/shell_scripts/GenerateEnsemble.csh
DART/branches/development/models/clm/shell_scripts/GetCleanStarts.csh
DART/branches/development/models/clm/work/input.nml
-------------- next part --------------
Modified: DART/branches/development/models/cam/clm_ens_avg.f90
===================================================================
--- DART/branches/development/models/cam/clm_ens_avg.f90 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/clm_ens_avg.f90 2013-04-25 03:19:58 UTC (rev 6082)
@@ -553,7 +553,7 @@
,flx_absiv , flx_absin )
deallocate (snowdp, h2osno, snlsno)
-call finalize_utilities()
+call finalize_utilities('clm_ens_avg')
contains
Modified: DART/branches/development/models/cam/column_rand.f90
===================================================================
--- DART/branches/development/models/cam/column_rand.f90 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/column_rand.f90 2013-04-25 03:19:58 UTC (rev 6082)
@@ -154,6 +154,6 @@
write(iunit, *) 'set_def.out'
! Shut down the utilities cleanly
-call finalize_utilities()
+call finalize_utilities('column_rand')
end program column_rand
Modified: DART/branches/development/models/cam/full_experiment/job_mpi.csh
===================================================================
--- DART/branches/development/models/cam/full_experiment/job_mpi.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/full_experiment/job_mpi.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -223,6 +223,7 @@
setenv COPY 'cp -vp'
setenv MOVE 'mv -fv'
setenv LINK 'ln -s'
+ set nonomatch
breaksw
endsw
Modified: DART/branches/development/models/cam/perfect_model/pmo.csh
===================================================================
--- DART/branches/development/models/cam/perfect_model/pmo.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/perfect_model/pmo.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -178,6 +178,7 @@
setenv COPY 'cp -vp'
setenv MOVE 'mv -fv'
setenv LINK 'ln -s'
+ set nonomatch
breaksw
endsw
Modified: DART/branches/development/models/cam/shell_scripts/CESM_setup_startup_hopper.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/CESM_setup_startup_hopper.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/CESM_setup_startup_hopper.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -70,8 +70,8 @@
setenv case Exp1
setenv compset F_2000
+setenv resolution f09_f09
setenv cesmtag cesm1_1_beta04
-setenv resolution f09_f09
setenv num_instances 4
setenv reuse_existing_case false
@@ -657,3 +657,10 @@
echo "./$case.$mach.submit"
echo ''
+exit 0
+
+# <next few lines under version control, do not edit>
+# $URL$
+# $Revision$
+# $Date$
+
Modified: DART/branches/development/models/cam/shell_scripts/CESM_setup_zagar.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/CESM_setup_zagar.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/CESM_setup_zagar.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -51,10 +51,10 @@
# ==== Set case options
# ====================================================================
- setenv case Fzagar
- setenv compset F_2000
+setenv case Fzagar
+setenv compset F_2000
+setenv resolution f09_f09
setenv ccsmtag cesm1_1_beta04
-setenv resolution f09_f09
setenv num_instances 80
setenv coldbuild false
@@ -455,3 +455,10 @@
echo "cd into ${caseroot} and run: ./$case.$mach.submit"
echo ''
+exit 0
+
+# <next few lines under version control, do not edit>
+# $URL$
+# $Revision$
+# $Date$
+
Modified: DART/branches/development/models/cam/shell_scripts/CESM_setup_zagar_pmo.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/CESM_setup_zagar_pmo.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/CESM_setup_zagar_pmo.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -51,10 +51,10 @@
# ==== Set case options
# ====================================================================
- setenv case Fzagar_pmo
- setenv compset F_2000
+setenv case Fzagar_pmo
+setenv compset F_2000
+setenv resolution f09_f09
setenv ccsmtag cesm1_1_beta04
-setenv resolution f09_f09
setenv num_instances 1
setenv coldbuild false
@@ -461,7 +461,10 @@
echo "cd into ${caseroot} and run: ./$case.$mach.submit"
echo ''
+exit 0
-# cd $caseroot
-# ./$case.$mach.submit
+# <next few lines under version control, do not edit>
+# $URL$
+# $Revision$
+# $Date$
Modified: DART/branches/development/models/cam/shell_scripts/advance_model.retry.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/advance_model.retry.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/advance_model.retry.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -99,7 +99,7 @@
echo "starting ${myname} for ens member $element at "`date` >> cam_out_temp
# get model state initial conditions for this ensemble member
- ${LINK} ${CENTRALDIR}/$input_file temp_ic
+ ${LINK} ${CENTRALDIR}/$input_file dart_restart
# get filter namelists for use by cam
${COPY} ${CENTRALDIR}/input.nml input.nml
@@ -164,7 +164,7 @@
# Create 'times' file for CAM from DART times in assim_model_state_ic#
# This info is passed to CAM through the creation of its namelist(s)
# Also extract state variables from assim_model_state_ic# into the caminput.nc file
- if (-e temp_ic && -e ${CENTRALDIR}/dart_to_cam) then
+ if (-e dart_restart && -e ${CENTRALDIR}/dart_to_cam) then
echo ' ' >> cam_out_temp
echo 'Executing dart_to_cam' >> cam_out_temp
${CENTRALDIR}/dart_to_cam >> cam_out_temp
Modified: DART/branches/development/models/cam/shell_scripts/assimilate.Fzagar.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/assimilate.Fzagar.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/assimilate.Fzagar.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -340,7 +340,7 @@
# DART namelist settings required:
# &filter_nml: restart_out_file_name = 'filter_ic_new'
# &ensemble_manager_nml: single_restart_file_in = '.false.'
-# &dart_to_cam_nml: dart_to_cam_input_file = 'temp_ic',
+# &dart_to_cam_nml: dart_to_cam_input_file = 'dart_restart',
# &dart_to_cam_nml: advance_time_present = .false.
# &atm_in_xxxx:ncdata = 'cam_initial_x.nc'
#-------------------------------------------------------------------------
@@ -356,7 +356,7 @@
cd $MYTEMPDIR
set DART_RESTART_FILE = `printf filter_ic_new.%04d ${member}`
- ${LINK} ../$DART_RESTART_FILE temp_ic
+ ${LINK} ../$DART_RESTART_FILE dart_restart
set ATM_POINTER_FILENAME = `printf rpointer.atm_%04d ${member}`
set LND_POINTER_FILENAME = `printf rpointer.lnd_%04d ${member}`
Modified: DART/branches/development/models/cam/shell_scripts/assimilate.hopper.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/assimilate.hopper.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/assimilate.hopper.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -357,7 +357,7 @@
# DART namelist settings required:
# &filter_nml: restart_out_file_name = 'filter_ic_new'
# &ensemble_manager_nml: single_restart_file_in = '.false.'
-# &dart_to_cam_nml: dart_to_cam_input_file = 'temp_ic',
+# &dart_to_cam_nml: dart_to_cam_input_file = 'dart_restart',
# &dart_to_cam_nml: advance_time_present = .false.
# &atm_in_xxxx:ncdata = 'cam_initial_x.nc'
#-------------------------------------------------------------------------
@@ -373,7 +373,7 @@
cd $MYTEMPDIR
set DART_RESTART_FILE = `printf filter_ic_new.%04d ${member}`
- ${LINK} ../$DART_RESTART_FILE temp_ic
+ ${LINK} ../$DART_RESTART_FILE dart_restart
set ATM_POINTER_FILENAME = `printf rpointer.atm_%04d ${member}`
set LND_POINTER_FILENAME = `printf rpointer.lnd_%04d ${member}`
Modified: DART/branches/development/models/cam/shell_scripts/assimilate.ned.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/assimilate.ned.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/assimilate.ned.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -366,7 +366,7 @@
# DART namelist settings required:
# &filter_nml: restart_out_file_name = 'filter_ic_new'
# &ensemble_manager_nml: single_restart_file_in = '.false.'
-# &dart_to_cam_nml: dart_to_cam_input_file = 'temp_ic',
+# &dart_to_cam_nml: dart_to_cam_input_file = 'dart_restart',
# &dart_to_cam_nml: advance_time_present = .false.
# &atm_in_xxxx:ncdata = 'cam_initial_x.nc'
#-------------------------------------------------------------------------
@@ -382,7 +382,7 @@
cd $MYTEMPDIR
set DART_RESTART_FILE = `printf filter_ic_new.%04d ${member}`
- ${LINK} ../$DART_RESTART_FILE temp_ic
+ ${LINK} ../$DART_RESTART_FILE dart_restart
set ATM_POINTER_FILENAME = `printf rpointer.atm_%04d ${member}`
set LND_POINTER_FILENAME = `printf rpointer.lnd_%04d ${member}`
Modified: DART/branches/development/models/cam/shell_scripts/assimilate.zagar.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/assimilate.zagar.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/assimilate.zagar.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -336,7 +336,7 @@
# DART namelist settings required:
# &filter_nml: restart_out_file_name = 'filter_ic_new'
# &ensemble_manager_nml: single_restart_file_in = '.false.'
-# &dart_to_cam_nml: dart_to_cam_input_file = 'temp_ic',
+# &dart_to_cam_nml: dart_to_cam_input_file = 'dart_restart',
# &dart_to_cam_nml: advance_time_present = .false.
# &atm_in_xxxx:ncdata = 'cam_initial_x.nc'
#-------------------------------------------------------------------------
@@ -352,7 +352,7 @@
cd $MYTEMPDIR
set DART_RESTART_FILE = `printf filter_ic_new.%04d ${member}`
- ${LINK} ../$DART_RESTART_FILE temp_ic
+ ${LINK} ../$DART_RESTART_FILE dart_restart
set ATM_POINTER_FILENAME = `printf rpointer.atm_%04d ${member}`
set LND_POINTER_FILENAME = `printf rpointer.lnd_%04d ${member}`
Modified: DART/branches/development/models/cam/shell_scripts/input.normal.nml
===================================================================
--- DART/branches/development/models/cam/shell_scripts/input.normal.nml 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/input.normal.nml 2013-04-25 03:19:58 UTC (rev 6082)
@@ -97,7 +97,7 @@
/
&dart_to_cam_nml
- dart_to_cam_input_file = 'temp_ic',
+ dart_to_cam_input_file = 'dart_restart',
dart_to_cam_output_file = 'caminput.nc',
advance_time_present = .true.,
/
Modified: DART/branches/development/models/cam/shell_scripts/input.pert0.nml
===================================================================
--- DART/branches/development/models/cam/shell_scripts/input.pert0.nml 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/input.pert0.nml 2013-04-25 03:19:58 UTC (rev 6082)
@@ -103,7 +103,7 @@
/
&dart_to_cam_nml
- dart_to_cam_input_file = 'temp_ic',
+ dart_to_cam_input_file = 'dart_restart',
dart_to_cam_output_file = 'caminput.nc',
advance_time_present = .true.,
/
Modified: DART/branches/development/models/cam/shell_scripts/job.simple.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/job.simple.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/job.simple.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -164,6 +164,7 @@
setenv REMOVE 'rm -rvf'
setenv COPY 'cp -vp'
setenv MOVE 'mv -fv'
+ set nonomatch
breaksw
endsw
Modified: DART/branches/development/models/cam/shell_scripts/pmo.ned.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/pmo.ned.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/pmo.ned.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -12,6 +12,7 @@
set COPY = 'cp -fv --preserve=timestamps'
set LINK = 'ln -fvs'
set REMOVE = 'rm -fr'
+set nonomatch
# for perfect model we only have a single state
set ensemble_size = 1
Modified: DART/branches/development/models/cam/shell_scripts/setup_cesm_case.hopper.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/setup_cesm_case.hopper.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/setup_cesm_case.hopper.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -415,6 +415,10 @@
echo "cd into ${caseroot} and run: ./$case.$mach.submit"
echo ''
-# cd ${caseroot}
-# ./$case.$mach.submit
+exit 0
+# <next few lines under version control, do not edit>
+# $URL$
+# $Revision$
+# $Date$
+
Modified: DART/branches/development/models/cam/shell_scripts/setup_cesm_case.ned.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/setup_cesm_case.ned.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/setup_cesm_case.ned.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -482,7 +482,10 @@
echo "cd into ${caseroot} and run: ./$case.$mach.submit"
echo ''
+exit 0
-# cd $caseroot
-# ./$case.$mach.submit
+# <next few lines under version control, do not edit>
+# $URL$
+# $Revision$
+# $Date$
Modified: DART/branches/development/models/cam/shell_scripts/setup_cesm_case.pmo.csh
===================================================================
--- DART/branches/development/models/cam/shell_scripts/setup_cesm_case.pmo.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/shell_scripts/setup_cesm_case.pmo.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -478,7 +478,10 @@
echo "cd into ${caseroot} and run: ./$case.$mach.submit"
echo ''
+exit 0
-# cd $caseroot
-# ./$case.$mach.submit
+# <next few lines under version control, do not edit>
+# $URL$
+# $Revision$
+# $Date$
Modified: DART/branches/development/models/cam/work/input_1.nml
===================================================================
--- DART/branches/development/models/cam/work/input_1.nml 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/work/input_1.nml 2013-04-25 03:19:58 UTC (rev 6082)
@@ -27,7 +27,7 @@
&dart_to_cam_nml
- dart_to_cam_input_file = 'temp_ic'
+ dart_to_cam_input_file = 'dart_restart'
dart_to_cam_output_file = 'caminput.nc'
advance_time_present = .false.
/
Modified: DART/branches/development/models/cam/work/input_capt.nml
===================================================================
--- DART/branches/development/models/cam/work/input_capt.nml 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/work/input_capt.nml 2013-04-25 03:19:58 UTC (rev 6082)
@@ -38,7 +38,7 @@
&dart_to_cam_nml
- dart_to_cam_input_file = 'temp_ic'
+ dart_to_cam_input_file = 'dart_restart'
dart_to_cam_output_file = 'caminput.nc'
advance_time_present = .false.
/
Modified: DART/branches/development/models/cam/work/input_n.nml
===================================================================
--- DART/branches/development/models/cam/work/input_n.nml 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/cam/work/input_n.nml 2013-04-25 03:19:58 UTC (rev 6082)
@@ -27,7 +27,7 @@
&dart_to_cam_nml
- dart_to_cam_input_file = 'temp_ic'
+ dart_to_cam_input_file = 'dart_restart'
dart_to_cam_output_file = 'caminput.nc'
advance_time_present = .false.
/
Modified: DART/branches/development/models/clm/shell_scripts/CESM_setup_bluefire.csh
===================================================================
--- DART/branches/development/models/clm/shell_scripts/CESM_setup_bluefire.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/clm/shell_scripts/CESM_setup_bluefire.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -85,10 +85,10 @@
setenv case clm_tim
setenv compset I_2000_CN
+setenv resolution f19_f19
setenv cesmtag cesm1_1_beta08
-setenv resolution f19_f19
setenv num_instances 4
-setenv reuse_existing_case true
+setenv reuse_existing_case false
# ====================================================================
# define machines and directories
@@ -174,6 +174,7 @@
set COPY = '/bin/cp -fv --preserve=timestamps'
set LINK = '/bin/ln -fvs'
set REMOVE = '/bin/rm -fr'
+ set nonomatch
breaksw
endsw
@@ -327,9 +328,9 @@
./xmlchange -file env_run.xml -id STOP_N -val $stop_n
#./xmlchange -file env_run.xml -id CALENDAR -val GREGORIAN
./xmlchange -file env_run.xml -id DOUT_S_ROOT -val ${archdir}
-./xmlchange -file env_run.xml -id DOUT_S -val FALSE
+./xmlchange -file env_run.xml -id DOUT_S -val TRUE
./xmlchange -file env_run.xml -id DOUT_S_SAVE_INT_REST_FILES -val FALSE
-./xmlchange -file env_run.xml -id DOUT_L_MS -val FALSE
+./xmlchange -file env_run.xml -id DOUT_L_MS -val TRUE
./xmlchange -file env_run.xml -id DOUT_L_MSROOT -val "csm/${case}"
./xmlchange -file env_run.xml -id DOUT_L_HTAR -val FALSE
@@ -568,3 +569,10 @@
echo "./$case.submit"
echo ''
+exit 0
+
+# <next few lines under version control, do not edit>
+# $URL$
+# $Revision$
+# $Date$
+
Modified: DART/branches/development/models/clm/shell_scripts/GenerateEnsemble.csh
===================================================================
--- DART/branches/development/models/clm/shell_scripts/GenerateEnsemble.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/clm/shell_scripts/GenerateEnsemble.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -46,3 +46,10 @@
echo ""
echo "Finished at "`date`
+exit 0
+
+# <next few lines under version control, do not edit>
+# $URL$
+# $Revision$
+# $Date$
+
Modified: DART/branches/development/models/clm/shell_scripts/GetCleanStarts.csh
===================================================================
--- DART/branches/development/models/clm/shell_scripts/GetCleanStarts.csh 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/clm/shell_scripts/GetCleanStarts.csh 2013-04-25 03:19:58 UTC (rev 6082)
@@ -49,3 +49,11 @@
# may need to change the internal date/filename
cp /gpfs/blhome/yfzhang/CLM_DART/DART/models/clm/work/obs_seq.0Z.20000106 ${NEWDIR}/obs_seq.0Z.20000106
+
+exit 0
+
+# <next few lines under version control, do not edit>
+# $URL$
+# $Revision$
+# $Date$
+
Modified: DART/branches/development/models/clm/work/input.nml
===================================================================
--- DART/branches/development/models/clm/work/input.nml 2013-04-25 03:03:15 UTC (rev 6081)
+++ DART/branches/development/models/clm/work/input.nml 2013-04-25 03:19:58 UTC (rev 6082)
@@ -50,6 +50,7 @@
output_inflation = .true.,
trace_execution = .true.,
silence = .false.,
+
inf_flavor = 0, 0,
inf_initial_from_restart = .false., .false.,
inf_sd_initial_from_restart = .false., .false.,
@@ -120,9 +121,11 @@
output_obs_kind_mod_file = '../../../obs_kind/obs_kind_mod.f90',
input_obs_def_mod_file = '../../../obs_def/DEFAULT_obs_def_mod.F90',
output_obs_def_mod_file = '../../../obs_def/obs_def_mod.f90',
- input_files = '../../../obs_def/obs_def_tower_mod.f90'
+ input_files = '../../../obs_def/obs_def_tower_mod.f90',
+ '../../../obs_def/obs_def_COSMOS_mod.f90',
/
+
# casename will get overwritten in the assimilate.csh script.
&obs_def_tower_nml
casename = '../dummy',
@@ -136,6 +139,7 @@
'TOWER_LATENT_HEAT_FLUX',
'TOWER_SENSIBLE_HEAT_FLUX',
'MODIS_SNOWCOVER_FRAC',
+ 'COSMOS_NEUTRON_INTENSITY',
evaluate_these_obs_types = 'null'
/
@@ -162,7 +166,7 @@
debug = 0,
clm_state_variables = 'frac_sno', 'KIND_SNOWCOVER_FRAC',
'H2OSNO', 'KIND_SNOW_WATER',
- 'H2OSOI_LIQ', 'KIND_LIQUID_WATER',
+ 'H2OSOI_LIQ', 'KIND_SOIL_MOISTURE',
'H2OSOI_ICE', 'KIND_ICE',
'T_SOISNO', 'KIND_SOIL_TEMPERATURE',
/
@@ -283,7 +287,7 @@
latlim2 = 75.0, 75.0, 75.0, 50,
reg_names = '20N-75N', '45N-75N', '0-75N', 'North Atlantic',
print_mismatched_locs = .false.,
- print_obs_locations = .false.,
+ create_rank_histogram = .true.,
verbose = .true.,
hlevel = 10.0, 20.0, 30.0, 40.0, 100.0,
200.0, 500.0, 1000.0, 2000.0,
More information about the Dart-dev
mailing list