merge folders, little more cleaning of driver script

notliveshell.csh

@@ -240,30 +240,6 @@ echo "We are using $yearstr $monthstr $daystr $cyclestr Z ($cyclestrsec seconds)
 echo "We are using $sstyearstr $sstmonthstr $sstdaystr $sstcyclestr Z for SST data"
 echo "SE initialization will occur at $se_yearstr $se_monthstr $se_daystr $se_cyclestr Z ($se_cyclestrsec seconds)"
 
-if [ $machineid -eq 1 ]
-then
-  echo "Using Yellowstone"
-elif [ $machineid -eq 2 ]
-then
-  echo "Using UMich Flux"
-  exit 1
-elif [ $machineid -eq 3 ]
-then
-  echo "Using UCDavis Agri"
-  sewxscriptsdir=/home/$LOGNAME/sewx/
-  gfs_files_path=/home/$LOGNAME/sewx/GFS
-  era_files_path=/home/$LOGNAME/getECMWFdata
-  gfs_to_cam_path=/home/$LOGNAME/sewx/gfs_to_cam
-  era_to_cam_path=/home/$LOGNAME/sewx/interim_to_cam
-  filter_path=/home/$LOGNAME/sewx/filter
-  path_to_case=/home/$LOGNAME
-  path_to_nc_files=$path_to_case/$gridname/run
-  outputdir=/home/$LOGNAME/${gridname}/run
-else
-  echo "Machine not supported"
-  exit 1
-fi
-
 if [ $debug -ne 1 ]
 then
 

sample_user_nl/user_nl_cam_filter

@@ -0,0 +1,37 @@
+! Users should add all user specific namelist changes below in the form of
+! namelist_var = new_namelist_value
+&cam_inparm
+ bnd_topo='/glade/scratch/zarzycki/unigridFiles/ecsnow_30_x4/topo/topo_ecsnow_30_x4_smooth.nc'
+ ncdata='/glade/p/work/zarzycki/sewx/INIC/ecsnow_30_x4_INIC.nc'
+ nhtfrq=1
+ mfilt=200
+ interpolate_analysis=.false.
+ fincl1='U:I','V:I','T:I','PS:I','Q:I','CLDICE:I','CLDLIQ:I','NUMICE:I','NUMLIQ:I','ICEFRAC:I'
+ empty_htapes=.TRUE.
+ inithist='ENDOFRUN'
+/
+&ctl_nl
+ dtime=450
+ se_nsplit=2
+ rsplit=3
+ hypervis_subcycle=4
+ se_ne=0
+ se_ftype=0
+ nu=8e-8
+ nu_div=20e-8
+ nu_p =8e-8
+ hypervis_scaling=3.2
+ nu_q=8e-8
+ nu_top=2.0e5
+ tstep_type=5
+ hypervis_power=0
+! nu=1.0000e13
+! nu_div=2.5000e13
+! nu_p = 1.00e13
+! nu_q = 1.00e13
+! nu_top = 2.0e5
+! fine_ne=120
+! hypervis_power=3.322
+! max_hypervis_courant=1.9
+ mesh_file = "/glade/p/work/zarzycki/grids/exodus/ecsnow_30_x4.g"
+/ 

sample_user_nl/user_nl_cam_run

@@ -0,0 +1,39 @@
+! Users should add all user specific namelist changes below in the form of
+! namelist_var = new_namelist_value
+&cam_inparm
+ bnd_topo='/glade/scratch/zarzycki/unigridFiles/ecsnow_30_x4/topo/topo_ecsnow_30_x4_smooth.nc'
+ ncdata='/glade/p/work/zarzycki/sewx/INIC/ecsnow_30_x4_INIC_filter.nc'
+ nhtfrq=0,-6
+ mfilt=1,1
+ interpolate_analysis=.false.,.true.
+ interp_nlat=361
+ interp_nlon=720
+ fincl2='PRECT:I','PRECSL:I','PRECSC:I','SST:I','U850:I','V850:I','PSL:I','ZBOT:I','UBOT:I','VBOT:I','T300:I','T200:I','FLUT:I','SST:I','U200:I','V200:I','OMEGA500:I','TMQ:I','Z500:I','PRECCav','PRECLav','SHFLX:I','LHFLX:I'
+! empty_htapes=.TRUE.
+ inithist='ENDOFRUN'
+/
+&ctl_nl
+ dtime=1800
+ se_nsplit=8
+ rsplit=3
+ hypervis_subcycle=4
+ se_ne=0
+ se_ftype=0
+ nu=8e-8
+ nu_div=20e-8
+ nu_p =8e-8
+ hypervis_scaling=3.2
+ nu_q=8e-8
+ nu_top=2.0e5
+ tstep_type=5
+ hypervis_power=0
+! nu=1.0000e13
+! nu_div=2.5000e13
+! nu_p = 1.00e13
+! nu_q = 1.00e13
+! nu_top = 2.0e5
+! fine_ne=120
+! hypervis_power=3.322
+! max_hypervis_courant=1.9
+ mesh_file = "/glade/p/work/zarzycki/grids/exodus/ecsnow_30_x4.g"
+/ 

sample_user_nl/user_nl_clm

@@ -0,0 +1,22 @@
+!----------------------------------------------------------------------------------
+! Users should add all user specific namelist changes below in the form of 
+! namelist_var = new_namelist_value 
+!
+! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
+! are set in the CLM_NAMELIST_OPTS env variable.
+!
+! EXCEPTIONS: 
+! Set co2_ppmv           with CCSM_CO2_PPMV                      option
+! Set co2_type           with CLM_CO2_TYPE                       option
+! Set dtime              with L_NCPL                             option
+! Set fatmlndfrc         with LND_DOMAIN_PATH/LND_DOMAIN_FILE    options
+!finidat=''
+!                        (includes $inst_string for multi-ensemble cases)
+!                        Also use CLM_FORCE_COLDSTART='on' to startup
+!finidat=''
+! Set glc_grid           with CISM_GRID                          option
+! Set glc_smb            with GLC_SMB                            option
+! Set maxpatch_glcmec    with GLC_NEC                            option
+!----------------------------------------------------------------------------------
+ flanduse_timeseries=''
+!finidat=''