[Dart-dev] DART/branches Revision: 12393

[dart at ucar.edu]

thoar at ucar.edu
2018-02-02 09:06:18 -0700 (Fri, 02 Feb 2018)
89
Preserving configuration that was working on CLM5 ...
shifting gears to focus on clm4.5




Modified: DART/branches/cesm_clm/models/clm/model_mod.f90
===================================================================
--- DART/branches/cesm_clm/models/clm/model_mod.f90	2018-02-02 00:07:33 UTC (rev 12392)
+++ DART/branches/cesm_clm/models/clm/model_mod.f90	2018-02-02 16:06:18 UTC (rev 12393)
@@ -24,6 +24,13 @@
 ! 7 ice (new glacier model)
 ! 8 crop (if using crop model)
 
+!>@todo FIXME
+! The allow_missing_in_clm   is now hardwired in the utilities/options_mod.f90 ...
+! since swe is the thing that is used, perhaps we can skip the allow_missing business
+! and just repartition swe in the dart_to_clm.f90 chunk - the number of layers in
+! each ensemble member can be different ...
+! This means we cannot use the snow layers in any of the forward operators ... 
+
 ! Modules that are absolutely required for use are listed
 use        types_mod, only : r4, r8, MISSING_R8, MISSING_I, MISSING_R4, &
                              obstypelength, i8
@@ -151,7 +158,6 @@
 !
 !  The DART state vector may consist of things like:
 !
-!  SNOWDP       aka  "snow depth"
 !  frac_sno     aka  "snow cover fraction"
 !  leafc        aka  "leaf carbon"
 !  T_SOISNO     aka  "temperature of soil & snow"
@@ -667,8 +673,8 @@
 endif
 
 ! Must group the variables according to the file they come from.
-!> @TODO FIXME ... add_domain() must do the right thing if nvars == 0
-!> @TODO FIXME ... io_filenames_nml:rpointer_file order must somehow match 
+!>@todo FIXME ... add_domain() must do the right thing if nvars == 0
+!>@todo FIXME ... io_filenames_nml:rpointer_file order must somehow match 
 !> - or be insensitive to - the add_domain() calls below (if nvars == 0) ...
 
 call cluster_variables(clm_restart_filename, nvars, var_names, var_qtys, var_ranges, var_update)
@@ -2175,7 +2181,7 @@
 !#    endif
 !# endif
 
-!> @todo FIXME Need to print debugging info for any task, not just task 0
+!>@todo FIXME Need to print debugging info for any task, not just task 0
 ! Print more information for the really curious
 if ((debug > 5)) then
    ! write(string1,*)'counter, total, total_area', counter, total, total_area

Modified: DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CESM2_0_setup_hybrid
===================================================================
--- DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CESM2_0_setup_hybrid	2018-02-02 00:07:33 UTC (rev 12392)
+++ DART/branches/cesm_clm/models/clm/shell_scripts/cesm2_0/CESM2_0_setup_hybrid	2018-02-02 16:06:18 UTC (rev 12393)
@@ -425,7 +425,7 @@
    echo "hist_empty_htapes = .true."                                    >> ${fname}
    echo "hist_fincl1 = 'NEP','TOTECOSYSC','TOTVEGC','TLAI'"             >> ${fname}
    echo "hist_fincl2 = 'NEP','FSH','EFLX_LH_TOT_R'"                     >> ${fname}
-   echo "hist_fincl3 = 'TV','TLAI','PBOT','TBOT','TSA','RH2M','SNOWDP'" >> ${fname}
+   echo "hist_fincl3 = 'TV','TLAI','PBOT','TBOT','TSA','RH2M_R','SNOWDP'" >> ${fname}
    echo "hist_nhtfrq = -$stop_n,1,-$stop_n"     >> ${fname}
    echo "hist_mfilt  = 1,$h1nsteps,1"           >> ${fname}
    echo "hist_avgflag_pertape = 'A','A','I'"    >> ${fname}

Modified: DART/branches/cesm_clm/models/clm/work/input.nml
===================================================================
--- DART/branches/cesm_clm/models/clm/work/input.nml	2018-02-02 00:07:33 UTC (rev 12392)
+++ DART/branches/cesm_clm/models/clm/work/input.nml	2018-02-02 16:06:18 UTC (rev 12393)
@@ -94,7 +94,6 @@
 &assim_tools_nml
    filter_kind                     = 1
    cutoff                          = 0.05
-   allow_missing_in_clm            = .true.
    sort_obs_inc                    = .false.
    spread_restoration              = .false.
    sampling_error_correction       = .false.