From 4333a66ca69d32a2f24aa81cbb9214ead5e8b763 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 14 Aug 2024 15:57:27 -0600 Subject: [PATCH 01/81] PPE mods from /glade/work/linnia/PPEn14trans brought to ctsm5.2.015 Bringing the diffs between branch_tags/PPE16... and branch_tags/PPE15... to b4b-dev manually --- src/biogeochem/CNFUNMod.F90 | 8 -------- src/biogeochem/CNPhenologyMod.F90 | 23 +++++++++++++---------- src/main/initVerticalMod.F90 | 11 +++++++++++ src/main/pftconMod.F90 | 11 +++++++++++ 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/biogeochem/CNFUNMod.F90 b/src/biogeochem/CNFUNMod.F90 index dde666c1f7..a6614fe4b9 100644 --- a/src/biogeochem/CNFUNMod.F90 +++ b/src/biogeochem/CNFUNMod.F90 @@ -53,7 +53,6 @@ module CNFUNMod public:: CNFUN ! Run FUN type, private :: params_type - real(r8) :: ndays_on ! number of days to complete leaf onset real(r8) :: ndays_off ! number of days to complete leaf offset end type params_type @@ -64,7 +63,6 @@ module CNFUNMod ! ! !PRIVATE DATA MEMBERS: real(r8) :: dt ! decomp timestep (seconds) - real(r8) :: ndays_on ! number of days to complete onset real(r8) :: ndays_off ! number of days to complete offset integer, private, parameter :: COST_METHOD = 2 !new way of doing the N uptake @@ -104,11 +102,6 @@ subroutine readParams ( ncid ) ! read in parameters - tString='ndays_on' - call ncd_io(varname=trim(tString),data=tempr, flag='read', ncid=ncid, readvar=readv) - if ( .not. readv ) call endrun( msg=trim(errCode)//trim(tString)//errMsg(sourcefile, __LINE__)) - params_inst%ndays_on=tempr - tString='ndays_off' call ncd_io(varname=trim(tString),data=tempr, flag='read', ncid=ncid, readvar=readv) if ( .not. readv ) call endrun( msg=trim(errCode)//trim(tString)//errMsg(sourcefile, __LINE__)) @@ -172,7 +165,6 @@ subroutine CNFUNInit (bounds,cnveg_state_inst,cnveg_carbonstate_inst,cnveg_nitro timestep_fun = real(secspday * fun_period) nstep_fun = int(secspday * dayspyr / dt) - ndays_on = params_inst%ndays_on ndays_off = params_inst%ndays_off !-------------------------------------------------------------------- diff --git a/src/biogeochem/CNPhenologyMod.F90 b/src/biogeochem/CNPhenologyMod.F90 index 9c7e5a331a..d8789eb30f 100644 --- a/src/biogeochem/CNPhenologyMod.F90 +++ b/src/biogeochem/CNPhenologyMod.F90 @@ -94,7 +94,6 @@ module CNPhenologyMod real(r8) :: crit_dayl_lat_slope ! Slope of time for critical day length with latitude (sec/deg) ! (Birch et. all 2021 it was 720 see line below) ! 15hr-11hr/(65N-45N)=linear slope = 720 min/latitude (Birch et. al 2021) - real(r8) :: ndays_on ! number of days to complete leaf onset real(r8) :: ndays_off ! number of days to complete leaf offset real(r8) :: fstor2tran ! fraction of storage to move to transfer for each onset real(r8) :: crit_onset_fdd ! critical number of freezing days to set gdd counter @@ -113,7 +112,6 @@ module CNPhenologyMod real(r8) :: dt ! time step delta t (seconds) real(r8) :: fracday ! dtime as a fraction of day real(r8) :: crit_dayl ! critical daylength for offset (seconds) - real(r8) :: ndays_on ! number of days to complete onset real(r8) :: ndays_off ! number of days to complete offset real(r8) :: fstor2tran ! fraction of storage to move to transfer on each onset real(r8) :: crit_onset_fdd ! critical number of freezing days @@ -310,7 +308,6 @@ subroutine readParams ( ncid ) call readNcdioScalar(ncid, 'crit_dayl', subname, params_inst%crit_dayl) call readNcdioScalar(ncid, 'crit_dayl_at_high_lat', subname, params_inst%crit_dayl_at_high_lat) call readNcdioScalar(ncid, 'crit_dayl_lat_slope', subname, params_inst%crit_dayl_lat_slope) - call readNcdioScalar(ncid, 'ndays_on', subname, params_inst%ndays_on) call readNcdioScalar(ncid, 'ndays_off', subname, params_inst%ndays_off) call readNcdioScalar(ncid, 'fstor2tran', subname, params_inst%fstor2tran) call readNcdioScalar(ncid, 'crit_onset_fdd', subname, params_inst%crit_onset_fdd) @@ -471,7 +468,6 @@ subroutine CNPhenologyInit(bounds) crit_dayl=params_inst%crit_dayl ! Set constants for CNSeasonDecidPhenology and CNStressDecidPhenology - ndays_on=params_inst%ndays_on ndays_off=params_inst%ndays_off ! set transfer parameters @@ -882,6 +878,8 @@ subroutine CNSeasonDecidPhenology (num_soilp, filter_soilp , & woody => pftcon%woody , & ! Input: binary flag for woody lifeform (1=woody, 0=not woody) season_decid => pftcon%season_decid , & ! Input: binary flag for seasonal-deciduous leaf habit (0 or 1) season_decid_temperate => pftcon%season_decid_temperate , & ! Input: binary flag for seasonal-deciduous temperate leaf habit (0 or 1) + crit_onset_gdd_sf => pftcon%crit_onset_gdd_sf , & ! Input: scale factor for crit_onset_gdd (unitless) + ndays_on => pftcon%ndays_on , & ! Input: number of days to complete leaf onset (days t_soisno => temperature_inst%t_soisno_col , & ! Input: [real(r8) (:,:) ] soil temperature (Kelvin) (-nlevsno+1:nlevgrnd) soila10 => temperature_inst%soila10_col , & ! Input: [real(r8) (:) ] @@ -1016,7 +1014,8 @@ subroutine CNSeasonDecidPhenology (num_soilp, filter_soilp , & lgsf(p) = 0._r8 ! onset gdd sum from Biome-BGC, v4.1.2 - crit_onset_gdd = exp(4.8_r8 + 0.13_r8*(annavg_t2m(p) - SHR_CONST_TKFRZ)) + crit_onset_gdd = crit_onset_gdd_sf(ivt(p)) * exp(4.8_r8 + 0.13_r8*(annavg_t2m(p) & + - SHR_CONST_TKFRZ)) ! set flag for solstice period (winter->summer = 1, summer->winter = 0) if (dayl(g) >= prev_dayl(g)) then @@ -1109,7 +1108,8 @@ subroutine CNSeasonDecidPhenology (num_soilp, filter_soilp , & onset_gddflag(p) = 0.0_r8 onset_gdd(p) = 0.0_r8 do_onset = .false. - onset_counter(p) = ndays_on * secspday + onset_counter(p) = ndays_on(ivt(p)) * secspday + ! move all the storage pools into transfer pools, ! where they will be transfered to displayed growth over the onset period. @@ -1399,7 +1399,10 @@ subroutine CNStressDecidPhenology (num_soilp, filter_soilp , & stress_decid => pftcon%stress_decid , & ! Input: binary flag for stress-deciduous leaf habit (0 or 1) leafcn => pftcon%leafcn , & ! Input: leaf C:N (gC/gN) frootcn => pftcon%frootcn , & ! Input: fine root C:N (gC/gN) - + + crit_onset_gdd_sf => pftcon%crit_onset_gdd_sf , & ! Input: scale factor for crit_onset_gdd (unitless) + ndays_on => pftcon%ndays_on , & ! Input: number of days to complete leaf onset (days) + soilpsi => soilstate_inst%soilpsi_col , & ! Input: [real(r8) (:,:) ] soil water potential in each soil layer (MPa) t_soisno => temperature_inst%t_soisno_col , & ! Input: [real(r8) (:,:) ] soil temperature (Kelvin) (-nlevsno+1:nlevgrnd) @@ -1532,8 +1535,8 @@ subroutine CNStressDecidPhenology (num_soilp, filter_soilp , & psi = soilpsi(c, phenology_soil_layer) ! onset gdd sum from Biome-BGC, v4.1.2 - crit_onset_gdd = exp(4.8_r8 + 0.13_r8*(annavg_t2m(p) - SHR_CONST_TKFRZ)) - + crit_onset_gdd = crit_onset_gdd_sf(ivt(p)) * exp(4.8_r8 + 0.13_r8*(annavg_t2m(p) & + - SHR_CONST_TKFRZ)) ! update offset_counter and test for the end of the offset period if (offset_flag(p) == 1._r8) then @@ -1673,7 +1676,7 @@ subroutine CNStressDecidPhenology (num_soilp, filter_soilp , & onset_fdd(p) = 0._r8 onset_gdd(p) = 0._r8 onset_swi(p) = 0._r8 - onset_counter(p) = ndays_on * secspday + onset_counter(p) = ndays_on(ivt(p)) * secspday ! call subroutine to move all the storage pools into transfer pools, ! where they will be transfered to displayed growth over the onset period. diff --git a/src/main/initVerticalMod.F90 b/src/main/initVerticalMod.F90 index b91c3439aa..64383e7a7c 100644 --- a/src/main/initVerticalMod.F90 +++ b/src/main/initVerticalMod.F90 @@ -47,6 +47,8 @@ module initVerticalMod type, private :: params_type real(r8) :: slopebeta ! exponent for microtopography pdf sigma (unitless) real(r8) :: slopemax ! max topographic slope for microtopography pdf sigma (unitless) + real(r8) :: zbedrock ! parameter to substitute for zbedrock (m) + real(r8) :: zbedrock_sf ! parameter to scale zbedrock (m) end type params_type type(params_type), private :: params_inst ! @@ -79,6 +81,9 @@ subroutine readParams( ncid ) ! Max topographic slope for microtopography pdf sigma (unitless) call readNcdioScalar(ncid, 'slopemax', subname, params_inst%slopemax) + call readNcdioScalar(ncid, 'zbedrock', subname, params_inst%zbedrock) + call readNcdioScalar(ncid, 'zbedrock_sf', subname, params_inst%zbedrock_sf) + end subroutine readParams !------------------------------------------------------------------------ @@ -447,6 +452,12 @@ subroutine initVertical(bounds, glc_behavior, thick_wall, thick_roof) call endrun( 'ERROR:: zbedrock not found on surface data set, and use_bedrock is true.'//errmsg(sourcefile, __LINE__) ) end if end if + if (params_inst%zbedrock>=0._r8) then + zbedrock_in(:) = params_inst%zbedrock + end if + if (params_inst%zbedrock_sf/=1._r8) then + zbedrock_in(:) = params_inst%zbedrock_sf*zbedrock_in(:) + end if ! if use_bedrock = false, set zbedrock to lowest layer bottom interface else diff --git a/src/main/pftconMod.F90 b/src/main/pftconMod.F90 index 7988b57e75..b987879c03 100644 --- a/src/main/pftconMod.F90 +++ b/src/main/pftconMod.F90 @@ -162,6 +162,8 @@ module pftconMod real(r8), allocatable :: taper (:) ! tapering ratio of height:radius_breast_height real(r8), allocatable :: rstem_per_dbh (:) ! stem resistance per dbh (s/m/m) real(r8), allocatable :: wood_density (:) ! wood density (kg/m3) + real(r8), allocatable :: crit_onset_gdd_sf(:)! scale factor for crit_onset_gdd + real(r8), allocatable :: ndays_on(:) ! number of days to complete leaf onset ! crop @@ -502,6 +504,8 @@ subroutine InitAllocate (this) allocate( this%taper (0:mxpft) ) allocate( this%rstem_per_dbh (0:mxpft) ) allocate( this%wood_density (0:mxpft) ) + allocate( this%crit_onset_gdd_sf (0:mxpft) ) + allocate( this%ndays_on (0:mxpft) ) end subroutine InitAllocate @@ -843,6 +847,11 @@ subroutine InitRead(this) call ncd_io('season_decid_temperate', this%season_decid_temperate, 'read', ncid, readvar=readv, posNOTonfile=.true.) if ( .not. readv ) call endrun(msg=' ERROR: error in reading in pft data'//errMsg(sourcefile, __LINE__)) + call ncd_io('crit_onset_gdd_sf', this%crit_onset_gdd_sf, 'read', ncid, readvar=readv, posNOTonfile=.true.) + if ( .not. readv ) call endrun(msg=' ERROR: error in reading in pft data'//errMsg(sourcefile, __LINE__)) + + call ncd_io('ndays_on', this%ndays_on, 'read', ncid, readvar=readv, posNOTonfile=.true.) + if ( .not. readv ) call endrun(msg=' ERROR: error in reading in pft data'//errMsg(sourcefile, __LINE__)) call ncd_io('pftpar20', this%pftpar20, 'read', ncid, readvar=readv, posNOTonfile=.true.) if ( .not. readv ) call endrun(msg=' ERROR: error in reading in pft data'//errMsg(sourcefile, __LINE__)) @@ -1585,6 +1594,8 @@ subroutine Clean(this) deallocate( this%rstem_per_dbh) deallocate( this%wood_density) deallocate( this%taper) + deallocate( this%crit_onset_gdd_sf) + deallocate( this%ndays_on) end subroutine Clean end module pftconMod From 7d8d0f6e2b47de2c0cb7a989942c995481a9c775 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 14 Aug 2024 17:35:00 -0600 Subject: [PATCH 02/81] Add failing tests for running with dust set by CAM so LND_SETS_DUST_EMIS_DRV_FLDS is FALSE --- bld/unit_testers/build-namelist_test.pl | 29 +++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index c51b0b0cb3..28e6084f0e 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -447,7 +447,32 @@ sub cat_and_create_namelistinfile { &cleanup(); } } - +print "\n===============================================================================\n"; +print "Test setting drv_flds_in fields in CAM"; +print "=================================================================================\n"; +foreach my $phys ( "clm5_0", "clm6_0" ) { + $mode = "-phys $phys CAM_SETS_DRV_FLDS"; + &make_config_cache($phys); + foreach my $options ( + "--res 1.9x2.5 --mask gx1v7 --bgc sp --no-megan --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam6.0", + "--res 1.9x2.5 --mask gx1v7 --bgc sp --no-megan --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0", + ) { + &make_env_run( 'LND_SETS_DUST_EMIS_DRV_FLDS'=>"FALSE" ); + eval{ system( "$bldnml --envxml_dir . $options > $tempfile 2>&1 " ); }; + is( $@, '', "options: $options" ); + $cfiles->checkfilesexist( "$options", $mode ); + $cfiles->shownmldiff( "default", $mode ); + if ( defined($opts{'compare'}) ) { + $cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode ); + $cfiles->dodiffonfile( "lnd_in", "$options", $mode ); + $cfiles->comparefiles( "$options", $mode, $opts{'compare'} ); + } + if ( defined($opts{'generate'}) ) { + $cfiles->copyfiles( "$options", $mode ); + } + &cleanup(); + } +} print "\n==============================================================\n"; print "Test several use_cases and specific configurations for clm5_0\n"; print "==============================================================\n"; @@ -518,7 +543,7 @@ sub cat_and_create_namelistinfile { phys=>"clm4_5", }, "LeungDust_WO_Prigent" =>{ options=>" -envxml_dir . -bgc sp", - namelst=>"use_prigent_roughness=.false.", + namelst=>"use_prigent_roughness=.true.", phys=>"clm5_1", }, "soilm_stream off w file" =>{ options=>"-res 0.9x1.25 -envxml_dir .", From a590ca7e57c965e1cfc46779cb5c6f1dc34bfb27 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 15 Aug 2024 01:59:10 -0600 Subject: [PATCH 03/81] When LND_SETS_DUST_EMIS_DRV_FLDS is FALSE read in CAM drv_flds_in namelist to use to determine dust_emis settings, still check that they aren't set in the user_nl_clm file --- bld/CLMBuildNamelist.pm | 51 +++++++++++++++---------- bld/unit_testers/build-namelist_test.pl | 4 +- bld/unit_testers/empty_user_nl_clm | 1 + 3 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 bld/unit_testers/empty_user_nl_clm diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index b99be288e7..daf4320c18 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -1470,6 +1470,32 @@ sub process_namelist_commandline_namelist { } } +sub process_namelist_infile { + my ($definition, $nl, $envxml_ref, $infile) = @_; + + # Make sure a valid file was found + if ( -f "$infile" ) { + # Otherwise abort as a valid file doesn't exist + } else { + $log->fatal_error("input namelist file does NOT exist $infile.\n $@"); + } + # Parse namelist input from the next file + my $nl_infile = Build::Namelist->new($infile); + + # Validate input namelist -- trap exceptions + my $nl_infile_valid; + eval { $nl_infile_valid = $definition->validate($nl_infile); }; + if ($@) { + $log->fatal_error("Invalid namelist variable in '-infile' $infile.\n $@"); + } + # Go through all variables and expand any XML env settings in them + expand_xml_variables_in_namelist( $nl_infile_valid, $envxml_ref ); + + # Merge input values into namelist. Previously specified values have higher precedence + # and are not overwritten. + $nl->merge_nl($nl_infile_valid); +} + #------------------------------------------------------------------------------- sub process_namelist_commandline_infile { @@ -1479,27 +1505,7 @@ sub process_namelist_commandline_infile { if (defined $opts->{'infile'}) { my @infiles = split( /,/, $opts->{'infile'} ); foreach my $infile ( @infiles ) { - # Make sure a valid file was found - if ( -f "$infile" ) { - # Otherwise abort as a valid file doesn't exist - } else { - $log->fatal_error("input namelist file does NOT exist $infile.\n $@"); - } - # Parse namelist input from the next file - my $nl_infile = Build::Namelist->new($infile); - - # Validate input namelist -- trap exceptions - my $nl_infile_valid; - eval { $nl_infile_valid = $definition->validate($nl_infile); }; - if ($@) { - $log->fatal_error("Invalid namelist variable in '-infile' $infile.\n $@"); - } - # Go through all variables and expand any XML env settings in them - expand_xml_variables_in_namelist( $nl_infile_valid, $envxml_ref ); - - # Merge input values into namelist. Previously specified values have higher precedence - # and are not overwritten. - $nl->merge_nl($nl_infile_valid); + process_namelist_infile( $definition, $nl, $envxml_ref, $infile ); } } } @@ -4086,6 +4092,9 @@ sub setup_logic_dust_emis { " connected to CAM as CAM should set them"); } } + # Now process the CAM drv_flds_in to get the dust settings + my $infile = $opts->{'envxml_dir'} . "/Buildconf/camconf/drv_flds_in"; + process_namelist_infile( $definition, $nl, $envxml_ref, $infile ); } } diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index 28e6084f0e..1b54f29d92 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -454,8 +454,8 @@ sub cat_and_create_namelistinfile { $mode = "-phys $phys CAM_SETS_DRV_FLDS"; &make_config_cache($phys); foreach my $options ( - "--res 1.9x2.5 --mask gx1v7 --bgc sp --no-megan --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam6.0", - "--res 1.9x2.5 --mask gx1v7 --bgc sp --no-megan --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0", + "--res 1.9x2.5 --mask gx1v7 --bgc sp --no-megan --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam6.0 --infile empty_user_nl_clm", + "--res 1.9x2.5 --mask gx1v7 --bgc sp --no-megan --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm", ) { &make_env_run( 'LND_SETS_DUST_EMIS_DRV_FLDS'=>"FALSE" ); eval{ system( "$bldnml --envxml_dir . $options > $tempfile 2>&1 " ); }; diff --git a/bld/unit_testers/empty_user_nl_clm b/bld/unit_testers/empty_user_nl_clm new file mode 100644 index 0000000000..45fda13d2c --- /dev/null +++ b/bld/unit_testers/empty_user_nl_clm @@ -0,0 +1 @@ +! empty user_nl_clm file From 648d0c4d2b607e7e470a7083a51662325045dc2b Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 15 Aug 2024 10:09:36 -0600 Subject: [PATCH 04/81] One-line fix for build to complete --- src/biogeochem/CNPhenologyMod.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/src/biogeochem/CNPhenologyMod.F90 b/src/biogeochem/CNPhenologyMod.F90 index d8789eb30f..8108876586 100644 --- a/src/biogeochem/CNPhenologyMod.F90 +++ b/src/biogeochem/CNPhenologyMod.F90 @@ -274,7 +274,6 @@ subroutine CNPhenologySetParams( ) params_inst%crit_dayl = 39200._r8 ! Seconds params_inst%crit_dayl_at_high_lat = 54000._r8 ! Seconds params_inst%crit_dayl_lat_slope = 720._r8 ! Seconds / degree - params_inst%ndays_on = 15._r8 ! Days params_inst%ndays_off = 30._r8 ! Days params_inst%fstor2tran = 0.5 ! Fraction params_inst%crit_onset_fdd = 15._r8 ! Days From 2ee88b8f8cc618c1f75d7fc3a1cc05be3e2bfbd0 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 15 Aug 2024 10:12:14 -0600 Subject: [PATCH 05/81] Update default param file names in namelists --- bld/namelist_files/namelist_defaults_ctsm.xml | 8 ++++---- .../clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 97620c770d..7f6305087c 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -504,10 +504,10 @@ attributes from the config_cache.xml file (with keys converted to upper-case). -lnd/clm2/paramdata/ctsm60_params.c240208.nc -lnd/clm2/paramdata/ctsm51_params.c240208.nc -lnd/clm2/paramdata/clm50_params.c240208.nc -lnd/clm2/paramdata/clm45_params.c240208.nc +lnd/clm2/paramdata/ctsm60_params.c240814.nc +lnd/clm2/paramdata/ctsm51_params.c240814.nc +lnd/clm2/paramdata/clm50_params.c240814.nc +lnd/clm2/paramdata/clm45_params.c240814.nc diff --git a/cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm index df20ced9e8..4bfc0520f8 100644 --- a/cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm @@ -1,2 +1,2 @@ use_soil_matrixcn = .true. -paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm60_params_cn30.c240625.nc' +paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm60_params_cn30.c240814.nc' From 733cf9918178fc89a1c6ee2c34447160e5e944fb Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 15 Aug 2024 15:20:33 -0600 Subject: [PATCH 06/81] Add missing cmeps drv_flds_in variables fixing #2170 --- .../namelist_definition_drv_flds.xml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/bld/namelist_files/namelist_definition_drv_flds.xml b/bld/namelist_files/namelist_definition_drv_flds.xml index 89bab07f4f..9bb1a3e3b0 100644 --- a/bld/namelist_files/namelist_definition_drv_flds.xml +++ b/bld/namelist_files/namelist_definition_drv_flds.xml @@ -123,6 +123,10 @@ List of fluxes needed by the CARMA model, from CLM to CAM. + + + + Which dust emission method is going to be used. Either the Zender 2003 scheme or the Leung 2023 scheme. @@ -136,4 +140,27 @@ (only used when dust_emis_method is Zender_2003) + + + + + + Frequency of surface ozone field passed from CAM to surface components. + Surface ozone is passed every coupling interval, but this namelist flag + indicates whether the timestep-level values are interpolated from a + coarser temporal resolution. + Default: set by CAM + + + + + + + + If TRUE atmosphere model will provide prognosed lightning flash frequency. + (NOTE: NOT CONNECTED INTO CTSM YET) + + From 3f3541b37b7ff9abe37050c98575b61b3702e688 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 15 Aug 2024 15:41:00 -0600 Subject: [PATCH 07/81] Current drv_flds_in file from CAM for a FHIST case, including some fields that weren't being set in CLM --- bld/unit_testers/Buildconf/camconf/drv_flds_in | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bld/unit_testers/Buildconf/camconf/drv_flds_in diff --git a/bld/unit_testers/Buildconf/camconf/drv_flds_in b/bld/unit_testers/Buildconf/camconf/drv_flds_in new file mode 100644 index 0000000000..e8e95ad369 --- /dev/null +++ b/bld/unit_testers/Buildconf/camconf/drv_flds_in @@ -0,0 +1,13 @@ +&drydep_inparm + dep_data_file = '/glade/campaign/cesm/cesmdata/inputdata/atm/cam/chem/trop_mozart/dvel/dep_data_c20221208.nc' +/ +&dust_emis_inparm + dust_emis_method = 'Zender_2003' + zender_soil_erod_source = 'atm' +/ +&lightning_coupling_nl + atm_provides_lightning = .true. +/ +&ozone_coupling_nl + atm_ozone_frequency = 'multiday_average' +/ From 6268e5907d7563d350fba6f7bb79b0bae3e6344d Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 16 Aug 2024 09:55:02 -0600 Subject: [PATCH 08/81] Add megan and drydep settings as per a cam6_4_015 SMS_Ln9.f19_f19_mg17.FHIST.derecho_intel.cam-outfrq9s test --- bld/unit_testers/Buildconf/camconf/drv_flds_in | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/bld/unit_testers/Buildconf/camconf/drv_flds_in b/bld/unit_testers/Buildconf/camconf/drv_flds_in index e8e95ad369..c551ccacf5 100644 --- a/bld/unit_testers/Buildconf/camconf/drv_flds_in +++ b/bld/unit_testers/Buildconf/camconf/drv_flds_in @@ -1,5 +1,16 @@ &drydep_inparm - dep_data_file = '/glade/campaign/cesm/cesmdata/inputdata/atm/cam/chem/trop_mozart/dvel/dep_data_c20221208.nc' + dep_data_file = '/glade/campaign/cesm/cesmdata/inputdata/atm/cam/chem/trop_mozart/dvel/dep_data_c20221208.nc' + drydep_list = 'DMS','H2O2','H2SO4','SO2','SOAG' +/ +&megan_emis_nl + megan_factors_file = '/glade/campaign/cesm/cesmdata/inputdata/atm/cam/chem/trop_mozart/emis/megan21_emis_factors_78pft_c20161108.nc' + megan_mapped_emisfctrs = .false. + megan_specifier = 'SOAE = 0.5954*isoprene + 5.1004*(carene_3 + pinene_a + thujene_a + bornene +', ' terpineol_4 + terpineol_a + terpinyl_ACT_a + myrtenal + sabinene + pinene_b + camphene +', + ' fenchene_a + limonene + phellandrene_a + terpinene_a + terpinene_g + terpinolene +', ' phellandrene_b + linalool + ionone_b + geranyl_acetone + neryl_acetone + jasmone +', + ' verbenene + ipsenol + myrcene + ocimene_t_b + ocimene_al + ocimene_c_b + 2met_nonatriene) + ', ' 12.3942*(farnescene_a + caryophyllene_b + acoradiene + aromadendrene + bergamotene_a +', + ' bergamotene_b + bisabolene_a + bisabolene_b + bourbonene_b + cadinene_d + cadinene_g +', ' cedrene_a + copaene_a + cubebene_a + cubebene_b + elemene_b + farnescene_b +', + ' germacrene_B + germacrene_D + gurjunene_b + humulene_a + humulene_g + isolongifolene +', ' longifolene + longipinene + muurolene_a + muurolene_g + selinene_b + selinene_d +', + ' nerolidol_c + nerolidol_t)' / &dust_emis_inparm dust_emis_method = 'Zender_2003' From 34839868c3b96149f619bd750e387da37d23e152 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 16 Aug 2024 15:20:53 -0600 Subject: [PATCH 09/81] Update another param file for aux_clm test to pass --- cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm index 3c686f08b9..3462b802c7 100644 --- a/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm @@ -1,2 +1,2 @@ -paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c240208.nc' +paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c240814.nc' hist_fincl1 = 'CWDC_HR','C13_CWDC_HR','C14_CWDC_HR','CWD_HR_L2','CWD_HR_L2_vr','CWD_HR_L3','CWD_HR_L3_vr' From 4045128f70293d187c97e7fc2ed73b2e5189397e Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 22 Apr 2024 16:08:48 -0600 Subject: [PATCH 10/81] update PLUMBER2 usermods to 5.2 datasets --- cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands | 1 - cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands | 1 - 170 files changed, 170 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index f64d8759a2..67baebcf55 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AR-SLu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index b8a54e5644..0efd0fad67 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AT-Neu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index 2d5e0d85fd..bbb56c040d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-ASM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index fe84b1e129..1d7734330f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cow_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index fcb7375d71..fcf027b8c2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cpr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index 8d42bed60a..6ce2fe74b1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ctr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 17aed3a1dd..090c330641 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index 816e4c78dc..27ebc931ee 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaP_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 0ea37fd95a..4fd48d214d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index 3cd8faecd9..b0b16bfa84 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Dry_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index 7822948582..2c84ebbe46 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Emr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 258ee5f12a..5d07cef0a1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-GWW_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 31071a2ebb..0a193b5299 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Gin_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 411cec6d9c..fb933852a1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-How_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index 7fc59ce824..07b31e742c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Lit_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 6671c26040..9cdc2603e3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Otw_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index db70e72c89..a1f5c227c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rig_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index 33e2084f14..491c105b41 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rob_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index 561ba257fa..cc4780d142 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Sam_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index 97db87c821..b47b5d5247 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Stp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index dee6244ef7..4078dbed33 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-TTE_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index 36cd89bc73..b22b411eec 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Tum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index 6b5d9415fe..87c5957833 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Whr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index e1751b8439..8f0303fe30 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Wrr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index 861c844b14..7606fa4a96 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ync_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index 5aeefbc792..876260dcc3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Bra_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 959a9e88fa..2ebc59db53 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Lon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index 008d71407c..21bf22d74c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Vie_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index c1277c1198..741ea74d27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=14400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BR-Sa3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index b2e5f88222..77944502cf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BW-Ma1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index adb752cea8..88ef538521 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index bb25a4ad93..9b89720f4a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index 733537f009..d5f16eac57 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index 491bc27b99..aca396c31d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS5_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index 3a1b6a7b0f..d9bd413c42 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS6_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 735c947bfe..1614d09505 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS7_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index c7123ae573..0d3cd7e1a0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-Qcu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index fb7fc215c9..8e80f8e897 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-Qfo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index ed6c584b7c..f479028097 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 1fffcfdac9..d83a6c2bf1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index 03096c96fa..17fcb052ba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index 1e2590a7ae..156ccfd380 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index c170c8b840..3ad08c65f5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Dav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 31e5163045..44bdb94425 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Fru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index ee091e134e..58b583af12 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Oe1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index cde3fed3be..e257bff2eb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index d5ec208a05..709e3f12ab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cng_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 674ce4dda4..5597e04781 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Dan_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index b9149c7d8a..6d0898e50d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Din_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index 42502b41ce..ecb62c468d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Du2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 95c4167bf0..95c2c4625e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-HaM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index 401534e487..4fd2927af6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Qia_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index 20309cdcb3..e72e38b648 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CZ-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index 6495d46b57..766eb3880f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Bay_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index d43c3bd94d..73c61a9d79 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Geb_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index fe165d2bf3..6bb17ac6a7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index fa5671c663..74f37b2314 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Hai_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 28fb89a2d0..ee09f48b7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Kli_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index 250432bd9f..66eca33f28 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Meh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index ef17febde0..b23d6d2b21 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Obe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index db837ac070..590e3b5812 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Seh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index bcff32c36a..a8532e908c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-SfN_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index aa6beb5913..3b9af13173 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Tha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index 12d6f2024d..f39a379185 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index a4a472424e..fbc465b915 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Fou_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index 962775613e..644cc92e00 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Lva_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index 4c806cea45..f54b4647b1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Ris_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 1748d52204..4868bd8135 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Sor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index ea72cc14c4..5d9e5c6e54 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-ZaH_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 38e841b51c..7d7da13008 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 47fae079e6..83905f3813 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index f8a0283232..5b33bf0cca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 8590e61f79..163fa43b1a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LgS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index bec50968d6..055e4df543 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-VDA_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 46cd461773..f4dad2be34 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Hyy_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index db4e320ca0..fcf3a3b6a0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Kaa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index 844403dfc4..4e3f36e65f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Lom_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index be6e3a2eba..c716a66993 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Sod_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 946c9b84fc..4ced43e5ff 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Fon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index fd29463244..6821e30d5a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index 88900143b1..ba56b6dfd4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Hes_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index 29c9c95ab7..491b472fda 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-LBr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index 676f8af611..bcda561678 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index b407160bb9..24847656fb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index b226175943..781321d36a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Pue_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index 1fef6cf769..25d9b73407 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_GF-Guy_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index a4cf969235..188f13bb21 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_HU-Bug_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index 794fdabba3..43ba6c29ba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ID-Pag_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index 376f21bf88..f202a45e45 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IE-Ca1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index 34bf806e19..2cbf857d0a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IE-Dri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index d0f80bd240..b52c8d408d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Amp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index 5c95ebd5cb..8399009a3c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-BCi_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index 4218939b8e..6358580049 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index f3e82597af..57eb7da218 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index de8970f1e3..b1e2439541 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index 37ab868476..a842fcbe02 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Col_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index e7bc47b3b0..7a6db3d102 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Cpz_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index 6cf225d172..e82c5cfa8f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Isp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index 8b388aedb4..c1f95210e6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 1f7f728803..33c3d49053 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Lav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index 26ffc80458..02952affac 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-MBo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index 6559976180..91f623aab1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Mal_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index 58be23bcd1..f75f23d917 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Noe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index 785443e0f1..af53f49fb9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Non_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index e7c30a4e36..e6af3c6a16 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-PT1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index dc1b5630d0..1793711024 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ren_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index 865f76ae9b..ddc9c0868e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index 401cfcf30b..4e87a351a6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index 7926235386..1604053cce 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SR2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index 8dbeedc751..5b89dbff9e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SRo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 6af519cf5d..b9c962fafc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_JP-SMF_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index 26b6fda5a4..4b46b3c6f0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Ca1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index ec509840af..dc5e4e1741 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Hor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 3bcbfbbc35..a7d5784572 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Loo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index 4eb88c995a..e68c1a7aa0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PL-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index 224920cbf7..5dd7ac93cf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Esp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index 74413f5f5e..dcb9da9c25 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Mi1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index f9aa12224c..40e570aa82 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Mi2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index 4abca52cae..6737ea4985 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Che_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index 74c3693f71..ce11407552 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Fyo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index b68d328625..a51ddc4edd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Zot_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index b2e63de838..de45fdf737 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SD-Dem_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index dfc8e4b83f..4d7588829f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SE-Deg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index efa3a6f1ae..da714e6178 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 47143973d4..22aa28cd0b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-Ham_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index 161de2a08e..c772c6ff8e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-PL3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 727e21a389..3f9e11af10 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-AR1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 5de187cd7a..6e9befc1c3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-AR2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index da1de52a6e..7ff3c302f2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-ARM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index 47ae3dd4d9..d044d71d9c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Aud_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 2d24f07e53..ca97f023f7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bar_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 9fb49876da..1341c5ed9a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bkg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index c208c920f7..40fd33b704 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Blo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index c802acf23c..be837ab2d1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bo1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index d66d11a697..3fbe5a7442 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=24 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Cop_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 621e4156ed..980fe40609 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-FPe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index a7548fbb53..b79cbbde03 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-GLE_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index ee1cf13767..a59dded80f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Goo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index 43d55bdbd1..863fe24c3d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ha1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1992" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index 7e9bda46b2..87a2d1d4f8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ho1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index 161a377821..a6d6ce7048 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-KS2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index b606ac7e9e..9c85ce58af 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Los_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index b817bac303..6ebdc0f52c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-MMS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index a666ccbaf0..7ef79f2ac6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-MOz_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index e07240f14f..19325ead49 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 6b26c589d9..43b2a75513 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index 6056ec6552..ffb7538463 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me6_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index 89c79b88bc..c1d6553e90 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Myb_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index 7185333ba0..a859ca34d6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-NR1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index 5ec7590921..150a7109e9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index 75d2215e6c..a43a4f0523 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index ceb48a35c0..cf8a20d653 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index e214fa5d26..a8c15c035c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-PFa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 0be161a3f5..6d34756259 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=32400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Prr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index b1944933fe..ef3192eac3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index 9ec9b25681..b070c1123b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index 72c94ad6a5..fbf338ca93 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index 53c07383d3..2f102954ef 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SRG_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index f8ab5b5b89..a930aeb922 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SRM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 7bd8324a6d..8b95474d55 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Syv_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index 2ac988eb2f..8fc48db2e3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ton_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index 0895943d1c..e9b5fb0a4d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Tw4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index 77649de143..d49419e72f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Twt_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 511e7e05c3..54b64467c3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-UMB_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index 8cbb483737..84c0fb82a0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Var_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index adcfb2eec4..e5aa83d4a4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-WCr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 0f091925f1..5e81cc5524 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Whs_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index da4a18b3f9..324cf4860f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Wkg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 016f4e4038..138996eda2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZA-Kru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index 2729227ecc..8443f0a13b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -4,7 +4,6 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZM-Mon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams From 932d07e217d917df70c44b03183d5ba4151b2290 Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 22 Apr 2024 17:49:22 -0600 Subject: [PATCH 11/81] keep hack to point to 5.2 surface data files --- cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands | 1 + 170 files changed, 170 insertions(+) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index 67baebcf55..44e145ec9c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AR-SLu_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index 0efd0fad67..8ea324b8a0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AT-Neu_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index bbb56c040d..301f741e84 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-ASM_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 1d7734330f..ed9e62746f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Cow_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index fcf027b8c2..49a0df7f70 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Cpr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index 6ce2fe74b1..2a6fd56772 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Ctr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 090c330641..210e549fa2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Cum_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index 27ebc931ee..f7692c9dfd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-DaP_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 4fd48d214d..194ca882da 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-DaS_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index b0b16bfa84..e1fa9be489 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Dry_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index 2c84ebbe46..43d63b2b46 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Emr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 5d07cef0a1..8eef1e7770 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-GWW_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 0a193b5299..43a7ec4705 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Gin_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index fb933852a1..3a0cc4f882 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-How_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index 07b31e742c..45d132bee8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Lit_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 9cdc2603e3..7e63474531 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Otw_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index a1f5c227c7..42bd3aac0c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Rig_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index 491c105b41..e51b36d89e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Rob_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index cc4780d142..919e322e8c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Sam_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index b47b5d5247..94cc191e2f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Stp_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 4078dbed33..3204d39d22 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-TTE_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index b22b411eec..51b0770e12 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Tum_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index 87c5957833..193218e604 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Whr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index 8f0303fe30..c5b6609661 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Wrr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index 7606fa4a96..57fb25a4cf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Ync_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index 876260dcc3..28beca48b1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BE-Bra_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 2ebc59db53..3833429771 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BE-Lon_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index 21bf22d74c..6936b7bb27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BE-Vie_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 741ea74d27..58a839b51c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=14400 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BR-Sa3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 77944502cf..88851105c0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BW-Ma1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index 88ef538521..962411e90b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index 9b89720f4a..897cf765df 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index d5f16eac57..d1d7315b2c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS4_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index aca396c31d..b73f17e9f6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS5_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index d9bd413c42..a785233c1f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS6_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 1614d09505..f97c5c5141 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS7_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index 0d3cd7e1a0..878c28ddf6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-Qcu_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index 8e80f8e897..bde28704c5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-Qfo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index f479028097..c529507b7e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-SF1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index d83a6c2bf1..aebfd10bbe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-SF2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index 17fcb052ba..bd68572dca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-SF3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index 156ccfd380..d8a0aa59c1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CH-Cha_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index 3ad08c65f5..19f4cc5ba0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CH-Dav_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 44bdb94425..291458c54b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CH-Fru_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index 58b583af12..964e24d852 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CH-Oe1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index e257bff2eb..8322f1f733 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Cha_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 709e3f12ab..dda99e3c4a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Cng_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 5597e04781..cdca7d7472 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Dan_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index 6d0898e50d..19f9baa8eb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Din_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index ecb62c468d..5f83542f35 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Du2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 95c2c4625e..e7a814451d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-HaM_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index 4fd2927af6..a44ff612b4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Qia_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index e72e38b648..d01359e568 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CZ-wet_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index 766eb3880f..cfde80c1de 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Bay_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index 73c61a9d79..834a2b3f96 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Geb_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 6bb17ac6a7..9fe2f16680 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Gri_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 74f37b2314..83bb6beb10 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Hai_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index ee09f48b7d..d8a15d9a53 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Kli_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index 66eca33f28..9ffbaf9c34 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Meh_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index b23d6d2b21..94afe08f04 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Obe_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index 590e3b5812..2daca0a2c1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Seh_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index a8532e908c..9bdef7293f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-SfN_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index 3b9af13173..e77813eec9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Tha_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index f39a379185..7563e5ff7e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Wet_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index fbc465b915..06a43e6df6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DK-Fou_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index 644cc92e00..bda3c08df5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DK-Lva_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index f54b4647b1..189e9b0ee7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DK-Ris_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 4868bd8135..2aa6510cd4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DK-Sor_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index 5d9e5c6e54..99a0558d7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DK-ZaH_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 7d7da13008..10d4e4399d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ES-ES1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 83905f3813..b72ddf79db 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ES-ES2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index 5b33bf0cca..6d69cfc70b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ES-LMa_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 163fa43b1a..2efa0f5a04 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ES-LgS_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index 055e4df543..83d071a6f8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ES-VDA_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index f4dad2be34..68d5a9739f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FI-Hyy_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index fcf3a3b6a0..43852577b1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FI-Kaa_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index 4e3f36e65f..c7e01ee357 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FI-Lom_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index c716a66993..ccf011b0e0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FI-Sod_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 4ced43e5ff..4af5380bee 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Fon_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index 6821e30d5a..dae1f22807 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Gri_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index ba56b6dfd4..00dd5c6771 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Hes_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index 491b472fda..21f28c8839 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-LBr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index bcda561678..4b8ae400d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Lq1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index 24847656fb..3e56a08786 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Lq2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index 781321d36a..4e4ddac3d5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Pue_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index 25d9b73407..6a2a814f69 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_GF-Guy_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index 188f13bb21..739810dd52 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_HU-Bug_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index 43ba6c29ba..e5e190ad1e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ID-Pag_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index f202a45e45..e9caca8f04 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IE-Ca1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index 2cbf857d0a..bdd48c2331 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IE-Dri_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index b52c8d408d..290836ff22 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Amp_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index 8399009a3c..ae21e12b51 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-BCi_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index 6358580049..3fbb828981 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-CA1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index 57eb7da218..18be6fbd02 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-CA2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index b1e2439541..46bff2a9e3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-CA3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index a842fcbe02..a62cad7d87 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Col_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index 7a6db3d102..6063242085 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Cpz_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index e82c5cfa8f..0ae339dba1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Isp_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index c1f95210e6..9f683c2101 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-LMa_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 33c3d49053..d1a8669b3e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Lav_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index 02952affac..6b2e4b2651 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-MBo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index 91f623aab1..e6f9ad1c51 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Mal_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index f75f23d917..eacfbce81e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Noe_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index af53f49fb9..543dc97221 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Non_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index e6af3c6a16..23afcb9469 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-PT1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index 1793711024..5b6afef969 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Ren_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index ddc9c0868e..f74dd07bab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Ro1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index 4e87a351a6..5d3a64aefb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Ro2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index 1604053cce..4cce0bb915 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-SR2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index 5b89dbff9e..2f89c5830f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-SRo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index b9c962fafc..287a41b541 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_JP-SMF_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index 4b46b3c6f0..7f88121b9b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_NL-Ca1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index dc5e4e1741..6134ec5fd6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_NL-Hor_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index a7d5784572..82a7f2458c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_NL-Loo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index e68c1a7aa0..394e350a18 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_PL-wet_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index 5dd7ac93cf..1552bd40e8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_PT-Esp_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index dcb9da9c25..b8cf3bc26d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_PT-Mi1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index 40e570aa82..404492a444 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_PT-Mi2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index 6737ea4985..6d92902d1f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_RU-Che_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index ce11407552..ca0223e1cf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_RU-Fyo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index a51ddc4edd..60778a180c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_RU-Zot_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index de45fdf737..985c3a010b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_SD-Dem_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index 4d7588829f..1c0165e925 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_SE-Deg_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index da714e6178..a29eeb03dc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_UK-Gri_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 22aa28cd0b..178ff627b9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_UK-Ham_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index c772c6ff8e..d0f256f358 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_UK-PL3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 3f9e11af10..0bf6cf3313 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-AR1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 6e9befc1c3..9751d08038 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-AR2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index 7ff3c302f2..3e4a6933bc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-ARM_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index d044d71d9c..1c193249b3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Aud_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index ca97f023f7..b681aac49d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Bar_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 1341c5ed9a..a81ec9e93f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Bkg_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index 40fd33b704..0d914e4416 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Blo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index be837ab2d1..f45ebc7076 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Bo1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index 3fbe5a7442..0ce199dd44 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=24 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Cop_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 980fe40609..1f6c1a2438 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-FPe_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index b79cbbde03..59ae899a7e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-GLE_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index a59dded80f..9a0d84e815 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Goo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index 863fe24c3d..0687c4cd3d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ha1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1992" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index 87a2d1d4f8..a0d98032eb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ho1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index a6d6ce7048..02d26509c2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-KS2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index 9c85ce58af..13ef4e69b4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Los_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index 6ebdc0f52c..8a271026dd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-MMS_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index 7ef79f2ac6..a98dae73c4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-MOz_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index 19325ead49..dc020bf1d1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Me2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 43b2a75513..77d787c3d4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Me4_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index ffb7538463..389ef600e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Me6_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index c1d6553e90..6cc05da64f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Myb_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index a859ca34d6..773ca669b1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-NR1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index 150a7109e9..f2adadd3ac 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ne1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index a43a4f0523..15ed24bdee 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ne2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index cf8a20d653..631bf243e4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ne3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index a8c15c035c..dd400a9257 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-PFa_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 6d34756259..28acc5f402 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=32400 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Prr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index ef3192eac3..37e05304a8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-SP1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index b070c1123b..a4ea7a35ac 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-SP2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index fbf338ca93..76c00c8a36 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-SP3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index 2f102954ef..804a5f9884 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-SRG_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index a930aeb922..9b379b1edb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-SRM_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 8b95474d55..0fe6c91305 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Syv_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index 8fc48db2e3..e97bac9028 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ton_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index e9b5fb0a4d..49ad7cddd2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Tw4_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index d49419e72f..447906c4fc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Twt_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 54b64467c3..1b3ee51b17 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-UMB_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index 84c0fb82a0..099e07e301 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Var_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index e5aa83d4a4..de5a646543 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-WCr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 5e81cc5524..f706a2e79a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Whs_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index 324cf4860f..0fc65819c2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Wkg_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 138996eda2..7c2dfed5c9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ZA-Kru_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index 8443f0a13b..825675dc9b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -4,6 +4,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ZM-Mon_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams From 0197db68574455c5c786f355f2cca00c374b25c6 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 23 Apr 2024 14:17:39 -0600 Subject: [PATCH 12/81] include plumber in cime_config --- cime_config/buildnml | 2 +- cime_config/config_component.xml | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 3eb45dff31..554010576e 100755 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": + if (("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name)) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 3c48e16651..1fc7a3a3a1 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -330,7 +330,8 @@ to create_newcase. The default value is UNSET. For NEON cases, this can be set to either NEON or NEON.PRISM, the latter of which would use PRISM precipitation instead of the default NEON precipitation. NEON cases then also - use the variable NEONSITE to specify the exact site. + use the variable NEONSITE to specify the exact site. PLUMBER cases use the variable + PLUMBER2SITE to specify the exact site. @@ -418,6 +419,28 @@ Version id of Neon data + + char + + + AR-SLu,AT-Neu,AU-ASM,AU-Cow,AU-Cpr,AU-Ctr,AU-Cum,AU-DaP,AU-DaS,AU-Dry,AU-Emr,AU-Gin,AU-GWW,AU-How,AU-Lit, + AU-Otw,AU-Rig,AU-Rob,AU-Sam,AU-Stp,AU-TTE,AU-Tum,AU-Whr,AU-Wrr,AU-Ync,BE-Bra,BE-Lon,BE-Vie,BR-Sa3,BW-Ma1,CA-NS1, + CA-NS2,CA-NS4,CA-NS5,CA-NS6,CA-NS7,CA-Qcu,CA-Qfo,CA-SF1,CA-SF2,CA-SF3,CH-Cha,CH-Dav,CH-Fru,CH-Oe1,CN-Cha,CN-Cng, + CN-Dan,CN-Din,CN-Du2,CN-HaM,CN-Qia,CZ-wet,DE-Bay,DE-Geb,DE-Gri,DE-Hai,DE-Kli,DE-Meh,DE-Obe,DE-Seh,DE-SfN,DE-Tha, + DE-Wet,DK-Fou,DK-Lva,DK-Ris,DK-Sor,DK-ZaH,ES-ES1,ES-ES2,ES-LgS,ES-LMa,ES-VDA,FI-Hyy,FI-Kaa,FI-Lom,FI-Sod,FR-Fon, + FR-Gri,FR-Hes,FR-LBr,FR-Lq1,FR-Lq2,FR-Pue,GF-Guy,HU-Bug,ID-Pag,IE-Ca1,IE-Dri,IT-Amp,IT-BCi,IT-CA1,IT-CA2,IT-CA3, + IT-Col,IT-Cpz,IT-Isp,IT-Lav,IT-LMa,IT-Mal,IT-MBo,IT-Noe,IT-Non,IT-PT1,IT-Ren,IT-Ro1,IT-Ro2,IT-SR2,IT-SRo,JP-SMF, + NL-Ca1,NL-Hor,NL-Loo,PL-wet,PT-Esp,PT-Mi1,PT-Mi2,RU-Che,RU-Fyo,RU-Zot,SD-Dem,SE-Deg,UK-Gri,UK-Ham,UK-PL3,US-AR1, + US-AR2,US-ARM,US-Aud,US-Bar,US-Bkg,US-Blo,US-Bo1,US-Cop,US-FPe,US-GLE,US-Goo,US-Ha1,US-Ho1,US-KS2,US-Los,US-Me2, + US-Me4,US-Me6,US-MMS,US-MOz,US-Myb,US-Ne1,US-Ne2,US-Ne3,US-NR1,US-PFa,US-Prr,US-SP1,US-SP2,US-SP3,US-SRG,US-SRM, + US-Syv,US-Ton,US-Tw4,US-Twt,US-UMB,US-Var,US-WCr,US-Whs,US-Wkg,ZA-Kru,ZM-Mon, + + + run_component_ctsm + env_run.xml + Name of site for PLUMBER tower data + + ========================================= CLM naming conventions From 8d5a3108e9aba322740ce8598b13a9154cfda0fa Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 23 Apr 2024 14:20:26 -0600 Subject: [PATCH 13/81] black changes due to previous commit causing issues --- cime_config/buildnml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 554010576e..8449ecadb2 100755 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -182,7 +182,9 @@ def buildnml(case, caseroot, compname): clm_phys = case.get_value("CLM_PHYSICS_VERSION") config_cache_text = _config_cache_template.format(clm_phys=clm_phys) - config_cache_path = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") + config_cache_path = os.path.join( + caseroot, "Buildconf", compname + "conf", "config_cache.xml" + ) with open(config_cache_path, "w") as config_cache_file: config_cache_file.write(config_cache_text) @@ -224,7 +226,9 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if (("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name)) and clm_force_coldstart == "off": + if ( + ("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name) + ) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" @@ -301,7 +305,9 @@ def buildnml(case, caseroot, compname): lndfrac_file = os.path.join(lnd_domain_path, lnd_domain_file) lndfrac_setting = "-lnd_frac " + lndfrac_file - config_cache_file = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") + config_cache_file = os.path.join( + caseroot, "Buildconf", compname + "conf", "config_cache.xml" + ) # ----------------------------------------------------- # Clear out old data @@ -364,7 +370,9 @@ def buildnml(case, caseroot, compname): break if not os.path.exists(os.path.join(rundir, clm_startfile)): - logger.warning("WARNING: Could NOT find a start file to use using" + clm_startfile) + logger.warning( + "WARNING: Could NOT find a start file to use using" + clm_startfile + ) clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile) else: clm_icfile = "" @@ -375,7 +383,9 @@ def buildnml(case, caseroot, compname): user_nl_file = os.path.join(caseroot, "user_nl_clm" + inst_string) namelist_infile = os.path.join(ctsmconf, "namelist") - create_namelist_infile(case, user_nl_file, namelist_infile, "\n".join(infile_lines)) + create_namelist_infile( + case, user_nl_file, namelist_infile, "\n".join(infile_lines) + ) cmd = os.path.join(lnd_root, "bld", "build-namelist") From 64df032bf39102c66528db274ae0c26cf661915d Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 1 May 2024 16:18:30 -0600 Subject: [PATCH 14/81] line too long update --- cime_config/buildnml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 8449ecadb2..8dc075c347 100755 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -204,8 +204,9 @@ def buildnml(case, caseroot, compname): if clm_force_coldstart == "on": clm_force_coldstart = "off" logger.warning( - "WARNING: You've turned on CLM_FORCE_COLDSTART for a branch run_type, which is a contradiction, the coldstart will be ignored\n" - + " turn off CLM_FORCE_COLDSTART, or set RUN_TYPE=hybrid to get rid of this warning" + "WARNING: You've turned on CLM_FORCE_COLDSTART for a branch run_type,\n" + + "which is a contradiction, the coldstart will be ignored\n" + + "turn off CLM_FORCE_COLDSTART or set RUN_TYPE=hybrid to get rid of this warning" ) if clm_force_coldstart == "on": From 24c8d7c75e41e09c431fc3868cee6b11e33169d5 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 1 May 2024 16:55:15 -0600 Subject: [PATCH 15/81] revert buildnml --- cime_config/buildnml | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) mode change 100755 => 100644 cime_config/buildnml diff --git a/cime_config/buildnml b/cime_config/buildnml old mode 100755 new mode 100644 index 8dc075c347..3eb45dff31 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -182,9 +182,7 @@ def buildnml(case, caseroot, compname): clm_phys = case.get_value("CLM_PHYSICS_VERSION") config_cache_text = _config_cache_template.format(clm_phys=clm_phys) - config_cache_path = os.path.join( - caseroot, "Buildconf", compname + "conf", "config_cache.xml" - ) + config_cache_path = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") with open(config_cache_path, "w") as config_cache_file: config_cache_file.write(config_cache_text) @@ -204,9 +202,8 @@ def buildnml(case, caseroot, compname): if clm_force_coldstart == "on": clm_force_coldstart = "off" logger.warning( - "WARNING: You've turned on CLM_FORCE_COLDSTART for a branch run_type,\n" - + "which is a contradiction, the coldstart will be ignored\n" - + "turn off CLM_FORCE_COLDSTART or set RUN_TYPE=hybrid to get rid of this warning" + "WARNING: You've turned on CLM_FORCE_COLDSTART for a branch run_type, which is a contradiction, the coldstart will be ignored\n" + + " turn off CLM_FORCE_COLDSTART, or set RUN_TYPE=hybrid to get rid of this warning" ) if clm_force_coldstart == "on": @@ -227,9 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if ( - ("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name) - ) and clm_force_coldstart == "off": + if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" @@ -306,9 +301,7 @@ def buildnml(case, caseroot, compname): lndfrac_file = os.path.join(lnd_domain_path, lnd_domain_file) lndfrac_setting = "-lnd_frac " + lndfrac_file - config_cache_file = os.path.join( - caseroot, "Buildconf", compname + "conf", "config_cache.xml" - ) + config_cache_file = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") # ----------------------------------------------------- # Clear out old data @@ -371,9 +364,7 @@ def buildnml(case, caseroot, compname): break if not os.path.exists(os.path.join(rundir, clm_startfile)): - logger.warning( - "WARNING: Could NOT find a start file to use using" + clm_startfile - ) + logger.warning("WARNING: Could NOT find a start file to use using" + clm_startfile) clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile) else: clm_icfile = "" @@ -384,9 +375,7 @@ def buildnml(case, caseroot, compname): user_nl_file = os.path.join(caseroot, "user_nl_clm" + inst_string) namelist_infile = os.path.join(ctsmconf, "namelist") - create_namelist_infile( - case, user_nl_file, namelist_infile, "\n".join(infile_lines) - ) + create_namelist_infile(case, user_nl_file, namelist_infile, "\n".join(infile_lines)) cmd = os.path.join(lnd_root, "bld", "build-namelist") From 7054bfa513620c2925052efdc06f6f577a1b2eb6 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 1 May 2024 16:56:35 -0600 Subject: [PATCH 16/81] ran black locally --- cime_config/buildnml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 3eb45dff31..a013a23162 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -182,7 +182,9 @@ def buildnml(case, caseroot, compname): clm_phys = case.get_value("CLM_PHYSICS_VERSION") config_cache_text = _config_cache_template.format(clm_phys=clm_phys) - config_cache_path = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") + config_cache_path = os.path.join( + caseroot, "Buildconf", compname + "conf", "config_cache.xml" + ) with open(config_cache_path, "w") as config_cache_file: config_cache_file.write(config_cache_text) @@ -301,7 +303,9 @@ def buildnml(case, caseroot, compname): lndfrac_file = os.path.join(lnd_domain_path, lnd_domain_file) lndfrac_setting = "-lnd_frac " + lndfrac_file - config_cache_file = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") + config_cache_file = os.path.join( + caseroot, "Buildconf", compname + "conf", "config_cache.xml" + ) # ----------------------------------------------------- # Clear out old data @@ -364,7 +368,9 @@ def buildnml(case, caseroot, compname): break if not os.path.exists(os.path.join(rundir, clm_startfile)): - logger.warning("WARNING: Could NOT find a start file to use using" + clm_startfile) + logger.warning( + "WARNING: Could NOT find a start file to use using" + clm_startfile + ) clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile) else: clm_icfile = "" @@ -375,7 +381,9 @@ def buildnml(case, caseroot, compname): user_nl_file = os.path.join(caseroot, "user_nl_clm" + inst_string) namelist_infile = os.path.join(ctsmconf, "namelist") - create_namelist_infile(case, user_nl_file, namelist_infile, "\n".join(infile_lines)) + create_namelist_infile( + case, user_nl_file, namelist_infile, "\n".join(infile_lines) + ) cmd = os.path.join(lnd_root, "bld", "build-namelist") From ad83d13cf10673340c2b3473b6677a3a1e8c2391 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 1 May 2024 16:58:12 -0600 Subject: [PATCH 17/81] undo local black run --- cime_config/buildnml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index a013a23162..3eb45dff31 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -182,9 +182,7 @@ def buildnml(case, caseroot, compname): clm_phys = case.get_value("CLM_PHYSICS_VERSION") config_cache_text = _config_cache_template.format(clm_phys=clm_phys) - config_cache_path = os.path.join( - caseroot, "Buildconf", compname + "conf", "config_cache.xml" - ) + config_cache_path = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") with open(config_cache_path, "w") as config_cache_file: config_cache_file.write(config_cache_text) @@ -303,9 +301,7 @@ def buildnml(case, caseroot, compname): lndfrac_file = os.path.join(lnd_domain_path, lnd_domain_file) lndfrac_setting = "-lnd_frac " + lndfrac_file - config_cache_file = os.path.join( - caseroot, "Buildconf", compname + "conf", "config_cache.xml" - ) + config_cache_file = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") # ----------------------------------------------------- # Clear out old data @@ -368,9 +364,7 @@ def buildnml(case, caseroot, compname): break if not os.path.exists(os.path.join(rundir, clm_startfile)): - logger.warning( - "WARNING: Could NOT find a start file to use using" + clm_startfile - ) + logger.warning("WARNING: Could NOT find a start file to use using" + clm_startfile) clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile) else: clm_icfile = "" @@ -381,9 +375,7 @@ def buildnml(case, caseroot, compname): user_nl_file = os.path.join(caseroot, "user_nl_clm" + inst_string) namelist_infile = os.path.join(ctsmconf, "namelist") - create_namelist_infile( - case, user_nl_file, namelist_infile, "\n".join(infile_lines) - ) + create_namelist_infile(case, user_nl_file, namelist_infile, "\n".join(infile_lines)) cmd = os.path.join(lnd_root, "bld", "build-namelist") From d0c6d4cf4c34435a40fdf2862db62bbd3475021d Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 1 May 2024 17:01:53 -0600 Subject: [PATCH 18/81] include plumber in cime_config #2 --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 3eb45dff31..554010576e 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": + if (("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name)) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From bf6044d67cb8e62c0c849815559a8200df41b0bd Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 1 May 2024 17:04:21 -0600 Subject: [PATCH 19/81] manual black attempt at fix --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 554010576e..23a4fe9bc7 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if (("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name)) and clm_force_coldstart == "off": + if ("NEON" in clm_usrdat_name or "PLUMBER" in clm_usrdat_name) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From e02dfa93d883d72f1a2c0a28e34ee26e9ef57cf8 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 1 May 2024 17:09:06 -0600 Subject: [PATCH 20/81] trying a workaround --- cime_config/buildnml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cime_config/buildnml b/cime_config/buildnml index 23a4fe9bc7..eea28d38fd 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,9 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data + # fmt: off if ("NEON" in clm_usrdat_name or "PLUMBER" in clm_usrdat_name) and clm_force_coldstart == "off": + # fmt: on if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From 2bb58d634b57cd3eff3aaa0c330dd4a48b991833 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 08:39:04 -0600 Subject: [PATCH 21/81] removed parantheses --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index eea28d38fd..c0e4fbb7f2 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -225,7 +225,7 @@ def buildnml(case, caseroot, compname): clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data # fmt: off - if ("NEON" in clm_usrdat_name or "PLUMBER" in clm_usrdat_name) and clm_force_coldstart == "off": + if "NEON" in clm_usrdat_name or "PLUMBER" in clm_usrdat_name and clm_force_coldstart == "off": # fmt: on if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None From ee6b01f052f4905e0db5dcb1cd4d796e1e8f7034 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 08:46:49 -0600 Subject: [PATCH 22/81] this should pass --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index c0e4fbb7f2..c965c4f0d1 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -225,7 +225,7 @@ def buildnml(case, caseroot, compname): clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data # fmt: off - if "NEON" in clm_usrdat_name or "PLUMBER" in clm_usrdat_name and clm_force_coldstart == "off": + if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": # fmt: on if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None From 4e6dbfbb31c91d293231cc13e65eb34795b995ff Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 08:48:48 -0600 Subject: [PATCH 23/81] added parantheses --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index c965c4f0d1..2461f37dac 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -225,7 +225,7 @@ def buildnml(case, caseroot, compname): clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data # fmt: off - if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": + if ("NEON" in clm_usrdat_name) and clm_force_coldstart == "off": # fmt: on if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None From f6a09fba8fd71a52bfe88578c685cfcedf344602 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 08:51:22 -0600 Subject: [PATCH 24/81] undo buildnml changes --- cime_config/buildnml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 2461f37dac..3eb45dff31 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,9 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - # fmt: off - if ("NEON" in clm_usrdat_name) and clm_force_coldstart == "off": - # fmt: on + if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From b9de93343ea87ee11d4ed85b3fe0117932fc076e Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 08:54:39 -0600 Subject: [PATCH 25/81] parantheses --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 3eb45dff31..9bf6766693 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": + if ("NEON" in clm_usrdat_name) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From 0c2cc0689f988b8301819dce77d5179b0ba110b0 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 08:56:40 -0600 Subject: [PATCH 26/81] test additional argument --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 9bf6766693..e446b20a74 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if ("NEON" in clm_usrdat_name) and clm_force_coldstart == "off": + if (("NEON" in clm_usrdat_name) or False) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From 2f65ab89fbbcb98d8d06ea2cc2ed080e002b0fea Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 09:08:06 -0600 Subject: [PATCH 27/81] use any --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index e446b20a74..a25a513219 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if (("NEON" in clm_usrdat_name) or False) and clm_force_coldstart == "off": + if (any(item in clm_usrdat_name for item in ["NEON", "PLUMBER"]) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From 02b20378bb1095300f7af721a790c32526b4c1cd Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 09:10:14 -0600 Subject: [PATCH 28/81] remove any and add additional statement --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index a25a513219..554010576e 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if (any(item in clm_usrdat_name for item in ["NEON", "PLUMBER"]) and clm_force_coldstart == "off": + if (("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name)) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From 1d7ed405c065e0fdbb0778a3b9769cf1049115f6 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 09:11:38 -0600 Subject: [PATCH 29/81] dummy argument test --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 554010576e..b298bfab4b 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if (("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name)) and clm_force_coldstart == "off": + if (("NEON" in clm_usrdat_name) or (False)) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From 8aa0286ab3e15676f72484a94c5007eee682bd6d Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 09:12:55 -0600 Subject: [PATCH 30/81] dummy argument test --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index b298bfab4b..e275e746f3 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if (("NEON" in clm_usrdat_name) or (False)) and clm_force_coldstart == "off": + if (("NEON" in clm_usrdat_name) or ("PLUMBER" in ['PLUMBER'])) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From e6c1e2a37ed9926e0bbbce877c8ecb1b769f11e5 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 09:14:46 -0600 Subject: [PATCH 31/81] dummy argument test --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index e275e746f3..2d502a74a3 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if (("NEON" in clm_usrdat_name) or ("PLUMBER" in ['PLUMBER'])) and clm_force_coldstart == "off": + if (("NEON" in clm_usrdat_name) or ("PLUMBER" in lnd_grid)) and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None or clm_usrdat_name is "NEON.PRISM" From ff05906c822d10bb223d3a493c7765f66e95cce6 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 09:18:02 -0600 Subject: [PATCH 32/81] try to separate lines --- cime_config/buildnml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 2d502a74a3..3f14a41250 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,15 +224,16 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if (("NEON" in clm_usrdat_name) or ("PLUMBER" in lnd_grid)) and clm_force_coldstart == "off": - if ("_transient" in clm_nml_use_case) and ( - re.fullmatch(r"\w\w\w\w\.transient", casename) is None - or clm_usrdat_name is "NEON.PRISM" - ): - logger.warning( - "WARNING: Do you have appropriate initial conditions for this simulation?" - + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case" - ) + if (("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name)): + if clm_force_coldstart == "off": + if ("_transient" in clm_nml_use_case) and ( + re.fullmatch(r"\w\w\w\w\.transient", casename) is None + or clm_usrdat_name is "NEON.PRISM" + ): + logger.warning( + "WARNING: Do you have appropriate initial conditions for this simulation?" + + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case" + ) if comp_atm != "datm": nomeg = "-no-megan" From 09b62d3a7a491f21c56fe859a815763b2a5394d7 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 2 May 2024 09:19:58 -0600 Subject: [PATCH 33/81] remove external parentheses --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 3f14a41250..acc74868e0 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -224,7 +224,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if (("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name)): + if ("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name): if clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None From af992361d81d0158ab653c87d25b3a06b7c0e3ff Mon Sep 17 00:00:00 2001 From: Teagan King Date: Fri, 28 Jun 2024 10:56:12 -0600 Subject: [PATCH 34/81] update usermods script and shell commands for fsurdat --- cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands | 2 +- 170 files changed, 225 insertions(+), 225 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index 44e145ec9c..d7f8707812 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AR-SLu ./xmlchange PTS_LON=-66.459808 ./xmlchange PTS_LAT=-33.464802 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AR-SLu_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index 8ea324b8a0..dc0750224f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AT-Neu ./xmlchange PTS_LON=11.3175 ./xmlchange PTS_LAT=47.116669 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AT-Neu_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index 301f741e84..f3eae9a24e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=133.24899299999998 -./xmlchange PTS_LAT=-22.283001000000002 +./xmlchange PLUMBER2SITE=AU-ASM +./xmlchange PTS_LON=133.248993 +./xmlchange PTS_LAT=-22.283001 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-ASM_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index ed9e62746f..9e44c8232c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Cow ./xmlchange PTS_LON=145.427155 ./xmlchange PTS_LAT=-16.23819 ./xmlchange DATM_YR_END=2015 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Cow_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index 49a0df7f70..114544e9b5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Cpr ./xmlchange PTS_LON=140.589127 ./xmlchange PTS_LAT=-34.00206 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Cpr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index 2a6fd56772..7af2976c83 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Ctr ./xmlchange PTS_LON=145.446854 ./xmlchange PTS_LAT=-16.103279 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Ctr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 210e549fa2..8c75b3de45 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Cum ./xmlchange PTS_LON=150.722473 -./xmlchange PTS_LAT=-33.613296999999996 +./xmlchange PTS_LAT=-33.613297 ./xmlchange DATM_YR_END=2018 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Cum_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index f7692c9dfd..44171b3425 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-DaP ./xmlchange PTS_LON=131.3181 ./xmlchange PTS_LAT=-14.0633 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-DaP_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 194ca882da..699b74900a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-DaS ./xmlchange PTS_LON=131.388 -./xmlchange PTS_LAT=-14.159282999999999 +./xmlchange PTS_LAT=-14.159283 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-DaS_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index e1fa9be489..a2a4686230 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Dry ./xmlchange PTS_LON=132.370605 ./xmlchange PTS_LAT=-15.2588 ./xmlchange DATM_YR_END=2015 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Dry_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index 43d63b2b46..7d9d557087 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Emr ./xmlchange PTS_LON=148.474594 ./xmlchange PTS_LAT=-23.8587 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Emr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 8eef1e7770..26bd398dc1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-GWW ./xmlchange PTS_LON=120.654099 ./xmlchange PTS_LAT=-30.191299 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-GWW_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 43a7ec4705..61d3c3eb01 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Gin ./xmlchange PTS_LON=115.650002 ./xmlchange PTS_LAT=-31.375 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Gin_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 3a0cc4f882..7cac687aa3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-How ./xmlchange PTS_LON=131.149994 ./xmlchange PTS_LAT=-12.4952 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-How_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index 45d132bee8..7f1a885344 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=130.79449499999998 -./xmlchange PTS_LAT=-13.179039999999999 +./xmlchange PLUMBER2SITE=AU-Lit +./xmlchange PTS_LON=130.794495 +./xmlchange PTS_LAT=-13.17904 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Lit_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 7e63474531..4016a12e52 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Otw ./xmlchange PTS_LON=142.816803 -./xmlchange PTS_LAT=-38.532340999999995 +./xmlchange PTS_LAT=-38.532341 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Otw_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index 42bd3aac0c..193f3cc5dd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Rig ./xmlchange PTS_LON=145.575897 ./xmlchange PTS_LAT=-36.649899 ./xmlchange DATM_YR_END=2016 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Rig_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index e51b36d89e..f7f4921746 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Rob ./xmlchange PTS_LON=145.630096 ./xmlchange PTS_LAT=-17.1175 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Rob_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index 919e322e8c..d1dae3a306 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=152.87780800000002 +./xmlchange PLUMBER2SITE=AU-Sam +./xmlchange PTS_LON=152.877808 ./xmlchange PTS_LAT=-27.3881 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Sam_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index 94cc191e2f..d0e4cdf638 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Stp ./xmlchange PTS_LON=133.350204 ./xmlchange PTS_LAT=-17.1507 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Stp_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 3204d39d22..3c878a3ae9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-TTE ./xmlchange PTS_LON=133.639999 ./xmlchange PTS_LAT=-22.287001 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-TTE_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index 51b0770e12..8e01ca6869 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Tum ./xmlchange PTS_LON=148.151703 ./xmlchange PTS_LAT=-35.656601 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Tum_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index 193218e604..5bde37cdc7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Whr ./xmlchange PTS_LON=145.029404 ./xmlchange PTS_LAT=-36.673199 ./xmlchange DATM_YR_END=2016 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Whr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index c5b6609661..76311551ed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Wrr ./xmlchange PTS_LON=146.654495 ./xmlchange PTS_LAT=-43.09502 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Wrr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index 57fb25a4cf..e7c1c495fc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=AU-Ync ./xmlchange PTS_LON=146.290695 ./xmlchange PTS_LAT=-34.9893 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_AU-Ync_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index 28beca48b1..4cb0c5af5c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=BE-Bra ./xmlchange PTS_LON=4.52056 ./xmlchange PTS_LAT=51.309166 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BE-Bra_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 3833429771..5ce5a904f5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=BE-Lon ./xmlchange PTS_LON=4.74613 -./xmlchange PTS_LAT=50.551590000000004 +./xmlchange PTS_LAT=50.55159 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BE-Lon_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index 6936b7bb27..0e4e802d91 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=BE-Vie ./xmlchange PTS_LON=5.99805 ./xmlchange PTS_LAT=50.305069 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BE-Vie_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 58a839b51c..114becfc06 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=BR-Sa3 ./xmlchange PTS_LON=-54.971436 -./xmlchange PTS_LAT=-3.0180290000000003 +./xmlchange PTS_LAT=-3.018029 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=14400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BR-Sa3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 88851105c0..7d0681f988 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=BW-Ma1 ./xmlchange PTS_LON=23.560329 ./xmlchange PTS_LAT=-19.9165 ./xmlchange DATM_YR_END=2000 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_BW-Ma1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index 962411e90b..47f8762dca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CA-NS1 ./xmlchange PTS_LON=-98.483887 ./xmlchange PTS_LAT=55.8792 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index 897cf765df..c787c85af0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CA-NS2 ./xmlchange PTS_LON=-98.524689 ./xmlchange PTS_LAT=55.9058 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index d1d7315b2c..5e4247d5ee 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CA-NS4 ./xmlchange PTS_LON=-98.380615 ./xmlchange PTS_LAT=55.914398 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS4_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index b73f17e9f6..bddbef5bb3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CA-NS5 ./xmlchange PTS_LON=-98.484985 ./xmlchange PTS_LAT=55.863098 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS5_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index a785233c1f..908a798b98 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CA-NS6 ./xmlchange PTS_LON=-98.964417 ./xmlchange PTS_LAT=55.916698 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS6_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index f97c5c5141..5734053c2b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-99.94830300000001 +./xmlchange PLUMBER2SITE=CA-NS7 +./xmlchange PTS_LON=-99.948303 ./xmlchange PTS_LAT=56.635799 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-NS7_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index 878c28ddf6..b68de255cb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CA-Qcu ./xmlchange PTS_LON=-74.03653 -./xmlchange PTS_LAT=49.267078000000005 +./xmlchange PTS_LAT=49.267078 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-Qcu_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index bde28704c5..8829dfb112 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CA-Qfo ./xmlchange PTS_LON=-74.342102 ./xmlchange PTS_LAT=49.692501 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-Qfo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index c529507b7e..f227bbb636 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CA-SF1 ./xmlchange PTS_LON=-105.817596 -./xmlchange PTS_LAT=54.485001000000004 +./xmlchange PTS_LAT=54.485001 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-SF1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index aebfd10bbe..8083656498 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CA-SF2 ./xmlchange PTS_LON=-105.877502 ./xmlchange PTS_LAT=54.253899 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-SF2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index bd68572dca..0c48e83347 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-106.00531000000001 +./xmlchange PLUMBER2SITE=CA-SF3 +./xmlchange PTS_LON=-106.00531 ./xmlchange PTS_LAT=54.091599 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CA-SF3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index d8a0aa59c1..8a769f83ff 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CH-Cha ./xmlchange PTS_LON=8.41044 ./xmlchange PTS_LAT=47.21022 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CH-Cha_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index 19f4cc5ba0..4a70829314 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CH-Dav ./xmlchange PTS_LON=9.85592 ./xmlchange PTS_LAT=46.815334 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CH-Dav_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 291458c54b..706c335415 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CH-Fru ./xmlchange PTS_LON=8.53778 ./xmlchange PTS_LAT=47.115833 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CH-Fru_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index 964e24d852..7dacd7a573 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CH-Oe1 ./xmlchange PTS_LON=7.73194 ./xmlchange PTS_LAT=47.285831 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CH-Oe1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index 8322f1f733..ac02990ed7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=128.09579499999998 +./xmlchange PLUMBER2SITE=CN-Cha +./xmlchange PTS_LON=128.095795 ./xmlchange PTS_LAT=42.4025 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Cha_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index dda99e3c4a..6e2582d175 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CN-Cng ./xmlchange PTS_LON=123.509201 ./xmlchange PTS_LAT=44.593399 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Cng_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index cdca7d7472..3b9c16a5f4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CN-Dan ./xmlchange PTS_LON=91.066399 -./xmlchange PTS_LAT=30.497801000000003 +./xmlchange PTS_LAT=30.497801 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Dan_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index 19f9baa8eb..f125b585da 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CN-Din ./xmlchange PTS_LON=112.536102 ./xmlchange PTS_LAT=23.1733 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Din_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index 5f83542f35..ca85d11837 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CN-Du2 ./xmlchange PTS_LON=116.2836 ./xmlchange PTS_LAT=42.0467 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Du2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index e7a814451d..8c557f6c07 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CN-HaM ./xmlchange PTS_LON=101.18 ./xmlchange PTS_LAT=37.369999 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-HaM_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index a44ff612b4..c0599132ef 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CN-Qia ./xmlchange PTS_LON=115.058098 ./xmlchange PTS_LAT=26.7414 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CN-Qia_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index d01359e568..d0ee8f1b57 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=CZ-wet ./xmlchange PTS_LON=14.77035 ./xmlchange PTS_LAT=49.024651 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_CZ-wet_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index cfde80c1de..2a0bb1ed7e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DE-Bay ./xmlchange PTS_LON=11.86694 -./xmlchange PTS_LAT=50.141940999999996 +./xmlchange PTS_LAT=50.141941 ./xmlchange DATM_YR_END=1999 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Bay_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index 834a2b3f96..9e42e4029f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DE-Geb ./xmlchange PTS_LON=10.9143 ./xmlchange PTS_LAT=51.100101 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Geb_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 9fe2f16680..5ae694eca6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=13.512529999999998 +./xmlchange PLUMBER2SITE=DE-Gri +./xmlchange PTS_LON=13.51253 ./xmlchange PTS_LAT=50.949471 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Gri_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 83bb6beb10..cfdacd4388 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DE-Hai ./xmlchange PTS_LON=10.453 ./xmlchange PTS_LAT=51.079166 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Hai_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index d8a15d9a53..2b4760861f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=13.522379999999998 +./xmlchange PLUMBER2SITE=DE-Kli +./xmlchange PTS_LON=13.52238 ./xmlchange PTS_LAT=50.893059 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Kli_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index 9ffbaf9c34..ace23c6499 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DE-Meh ./xmlchange PTS_LON=10.65547 ./xmlchange PTS_LAT=51.275311 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Meh_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index 94afe08f04..81d983ac51 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DE-Obe ./xmlchange PTS_LON=13.72129 ./xmlchange PTS_LAT=50.786659 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Obe_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index 2daca0a2c1..99b14107c6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DE-Seh ./xmlchange PTS_LON=6.44965 ./xmlchange PTS_LAT=50.870625 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Seh_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index 9bdef7293f..70c6009607 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DE-SfN ./xmlchange PTS_LON=11.3275 ./xmlchange PTS_LAT=47.806389 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-SfN_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index e77813eec9..33b2870a58 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=13.566939999999999 +./xmlchange PLUMBER2SITE=DE-Tha +./xmlchange PTS_LON=13.56694 ./xmlchange PTS_LAT=50.963612 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Tha_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index 7563e5ff7e..947d965270 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DE-Wet ./xmlchange PTS_LON=11.45753 ./xmlchange PTS_LAT=50.453499 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DE-Wet_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index 06a43e6df6..a34d0eb77a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DK-Fou ./xmlchange PTS_LON=9.58722 ./xmlchange PTS_LAT=56.4842 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DK-Fou_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index bda3c08df5..06f512c753 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DK-Lva ./xmlchange PTS_LON=12.0833 ./xmlchange PTS_LAT=55.6833 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DK-Lva_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index 189e9b0ee7..bb2be42089 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DK-Ris ./xmlchange PTS_LON=12.09722 ./xmlchange PTS_LAT=55.530281 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DK-Ris_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 2aa6510cd4..efe8c0ad42 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=11.644639999999999 +./xmlchange PLUMBER2SITE=DK-Sor +./xmlchange PTS_LON=11.64464 ./xmlchange PTS_LAT=55.48587 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DK-Sor_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index 99a0558d7d..cca198c906 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=DK-ZaH ./xmlchange PTS_LON=-20.550293 ./xmlchange PTS_LAT=74.473282 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_DK-ZaH_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 10d4e4399d..9cc4725f98 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=ES-ES1 ./xmlchange PTS_LON=-0.318817 ./xmlchange PTS_LAT=39.34597 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ES-ES1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index b72ddf79db..03a6ccf482 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=ES-ES2 ./xmlchange PTS_LON=-0.315277 -./xmlchange PTS_LAT=39.275558000000004 +./xmlchange PTS_LAT=39.275558 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ES-ES2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index 6d69cfc70b..f36c6be9fc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=ES-LMa ./xmlchange PTS_LON=-5.773346 ./xmlchange PTS_LAT=39.941502 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ES-LMa_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 2efa0f5a04..2a701bb99f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=ES-LgS ./xmlchange PTS_LON=-2.96582 ./xmlchange PTS_LAT=37.097935 ./xmlchange DATM_YR_END=2007 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ES-LgS_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index 83d071a6f8..e7971529d9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=ES-VDA ./xmlchange PTS_LON=1.4485 ./xmlchange PTS_LAT=42.15218 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ES-VDA_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 68d5a9739f..7ac714599a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=FI-Hyy ./xmlchange PTS_LON=24.295 ./xmlchange PTS_LAT=61.8475 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FI-Hyy_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index 43852577b1..339a244afa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=27.295030999999998 +./xmlchange PLUMBER2SITE=FI-Kaa +./xmlchange PTS_LON=27.295031 ./xmlchange PTS_LAT=69.140694 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FI-Kaa_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index c7e01ee357..dea60aca09 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=FI-Lom ./xmlchange PTS_LON=24.209181 ./xmlchange PTS_LAT=67.9972 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FI-Lom_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index ccf011b0e0..08773c8443 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=FI-Sod ./xmlchange PTS_LON=26.637831 ./xmlchange PTS_LAT=67.361862 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FI-Sod_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 4af5380bee..550ce300cd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=2.7801400000000003 -./xmlchange PTS_LAT=48.476397999999996 +./xmlchange PLUMBER2SITE=FR-Fon +./xmlchange PTS_LON=2.78014 +./xmlchange PTS_LAT=48.476398 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Fon_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index dae1f22807..169e85a270 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=1.9519099999999998 +./xmlchange PLUMBER2SITE=FR-Gri +./xmlchange PTS_LON=1.95191 ./xmlchange PTS_LAT=48.844219 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Gri_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index 00dd5c6771..18a9e57b29 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=7.0655600000000005 +./xmlchange PLUMBER2SITE=FR-Hes +./xmlchange PTS_LON=7.06556 ./xmlchange PTS_LAT=48.67416 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Hes_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index 21f28c8839..ee89868fa1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-0.7692869999999999 +./xmlchange PLUMBER2SITE=FR-LBr +./xmlchange PTS_LON=-0.769287 ./xmlchange PTS_LAT=44.71711 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-LBr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index 4b8ae400d7..c5025aba8b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=FR-Lq1 ./xmlchange PTS_LON=2.73583 ./xmlchange PTS_LAT=45.643059 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Lq1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index 3e56a08786..26581437b9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=FR-Lq2 ./xmlchange PTS_LON=2.73703 ./xmlchange PTS_LAT=45.639191 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Lq2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index 4e4ddac3d5..13fab2f770 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=3.5958300000000003 +./xmlchange PLUMBER2SITE=FR-Pue +./xmlchange PTS_LON=3.59583 ./xmlchange PTS_LAT=43.74139 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_FR-Pue_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index 6a2a814f69..bafc0737b8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=GF-Guy ./xmlchange PTS_LON=-52.924866 ./xmlchange PTS_LAT=5.278772 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_GF-Guy_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index 739810dd52..98e5672dc2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=19.601298999999997 +./xmlchange PLUMBER2SITE=HU-Bug +./xmlchange PTS_LON=19.601299 ./xmlchange PTS_LAT=46.691101 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_HU-Bug_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index e5e190ad1e..a71ecdf659 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=114.03639199999999 +./xmlchange PLUMBER2SITE=ID-Pag +./xmlchange PTS_LON=114.036392 ./xmlchange PTS_LAT=-2.345 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ID-Pag_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index e9caca8f04..98d668df9e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IE-Ca1 ./xmlchange PTS_LON=-6.918152 -./xmlchange PTS_LAT=52.858791000000004 +./xmlchange PTS_LAT=52.858791 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IE-Ca1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index bdd48c2331..edb036e775 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-8.751800999999999 +./xmlchange PLUMBER2SITE=IE-Dri +./xmlchange PTS_LON=-8.751801 ./xmlchange PTS_LAT=51.986691 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IE-Dri_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index 290836ff22..3a4195c030 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-Amp ./xmlchange PTS_LON=13.60516 ./xmlchange PTS_LAT=41.904099 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Amp_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index ae21e12b51..ada711ab6e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-BCi ./xmlchange PTS_LON=14.95744 ./xmlchange PTS_LAT=40.5238 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-BCi_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index 3fbb828981..9ff3031f4d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-CA1 ./xmlchange PTS_LON=12.02656 ./xmlchange PTS_LAT=42.380409 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-CA1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index 18be6fbd02..2041d6983d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-CA2 ./xmlchange PTS_LON=12.02604 ./xmlchange PTS_LAT=42.37722 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-CA2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index 46bff2a9e3..50253ccc6b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-CA3 ./xmlchange PTS_LON=12.0222 ./xmlchange PTS_LAT=42.380001 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-CA3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index a62cad7d87..06e653c0b9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-Col ./xmlchange PTS_LON=13.58814 ./xmlchange PTS_LAT=41.849361 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Col_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index 6063242085..b7b1ae449d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-Cpz ./xmlchange PTS_LON=12.37611 ./xmlchange PTS_LAT=41.70525 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Cpz_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index 0ae339dba1..873293a7aa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-Isp ./xmlchange PTS_LON=8.63358 ./xmlchange PTS_LAT=45.812641 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Isp_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index 9f683c2101..b8efb6955e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-LMa ./xmlchange PTS_LON=7.58259 ./xmlchange PTS_LAT=45.15258 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-LMa_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index d1a8669b3e..a50e9dc664 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-Lav ./xmlchange PTS_LON=11.28132 ./xmlchange PTS_LAT=45.9562 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Lav_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index 6b2e4b2651..0c60de60ba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-MBo ./xmlchange PTS_LON=11.04583 ./xmlchange PTS_LAT=46.014679 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-MBo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index e6f9ad1c51..34c3d12aa2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=11.703339999999999 +./xmlchange PLUMBER2SITE=IT-Mal +./xmlchange PTS_LON=11.70334 ./xmlchange PTS_LAT=46.114021 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Mal_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index eacfbce81e..bd8d0e486c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-Noe ./xmlchange PTS_LON=8.15117 ./xmlchange PTS_LAT=40.606178 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Noe_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index 543dc97221..3084a49d8a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-Non ./xmlchange PTS_LON=11.09109 -./xmlchange PTS_LAT=44.690189000000004 +./xmlchange PTS_LAT=44.690189 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Non_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index 23afcb9469..f82e0b8eb9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-PT1 ./xmlchange PTS_LON=9.06104 ./xmlchange PTS_LAT=45.200871 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-PT1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index 5b6afef969..80927456e8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=11.433689999999999 +./xmlchange PLUMBER2SITE=IT-Ren +./xmlchange PTS_LON=11.43369 ./xmlchange PTS_LAT=46.586861 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Ren_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index f74dd07bab..209a0c032d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=11.930010000000001 +./xmlchange PLUMBER2SITE=IT-Ro1 +./xmlchange PTS_LON=11.93001 ./xmlchange PTS_LAT=42.408119 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Ro1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index 5d3a64aefb..55e5f4f128 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-Ro2 ./xmlchange PTS_LON=11.92093 ./xmlchange PTS_LAT=42.390259 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-Ro2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index 4cce0bb915..bd1211a9c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-SR2 ./xmlchange PTS_LON=10.29095 ./xmlchange PTS_LAT=43.732029 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-SR2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index 2f89c5830f..a0aa3f3aa5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=IT-SRo ./xmlchange PTS_LON=10.28444 ./xmlchange PTS_LAT=43.727859 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_IT-SRo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 287a41b541..17be0e9534 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=137.07879599999998 +./xmlchange PLUMBER2SITE=JP-SMF +./xmlchange PTS_LON=137.078796 ./xmlchange PTS_LAT=35.2617 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_JP-SMF_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index 7f88121b9b..fd82f6a049 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=NL-Ca1 ./xmlchange PTS_LON=4.927 ./xmlchange PTS_LAT=51.971001 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_NL-Ca1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index 6134ec5fd6..e4712093fa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=NL-Hor ./xmlchange PTS_LON=5.0713 ./xmlchange PTS_LAT=52.240349 ./xmlchange DATM_YR_END=2011 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_NL-Hor_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 82a7f2458c..d825ace2ba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=5.7435599999999996 -./xmlchange PTS_LAT=52.166579999999996 +./xmlchange PLUMBER2SITE=NL-Loo +./xmlchange PTS_LON=5.74356 +./xmlchange PTS_LAT=52.16658 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_NL-Loo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index 394e350a18..80bb1b37c5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=PL-wet ./xmlchange PTS_LON=16.309401 ./xmlchange PTS_LAT=52.762199 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_PL-wet_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index 1552bd40e8..b56b6968f1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=PT-Esp ./xmlchange PTS_LON=-8.601807 ./xmlchange PTS_LAT=38.6394 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_PT-Esp_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index b8cf3bc26d..2d35f26a06 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=PT-Mi1 ./xmlchange PTS_LON=-8.000061 ./xmlchange PTS_LAT=38.540642 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_PT-Mi1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index 404492a444..b02616ee02 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=PT-Mi2 ./xmlchange PTS_LON=-8.024536 ./xmlchange PTS_LAT=38.476501 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_PT-Mi2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index 6d92902d1f..dff0478e08 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=RU-Che ./xmlchange PTS_LON=161.341431 ./xmlchange PTS_LAT=68.613037 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_RU-Che_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index ca0223e1cf..d90a4af0bc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=RU-Fyo ./xmlchange PTS_LON=32.922081 -./xmlchange PTS_LAT=56.461529000000006 +./xmlchange PTS_LAT=56.461529 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_RU-Fyo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index 60778a180c..1d42ea947f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=RU-Zot ./xmlchange PTS_LON=89.3508 ./xmlchange PTS_LAT=60.8008 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_RU-Zot_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index 985c3a010b..2b471ebc27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=SD-Dem ./xmlchange PTS_LON=30.4783 ./xmlchange PTS_LAT=13.2829 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_SD-Dem_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index 1c0165e925..34a53f5533 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=SE-Deg ./xmlchange PTS_LON=19.55669 ./xmlchange PTS_LAT=64.181969 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_SE-Deg_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index a29eeb03dc..6cd7cb38f4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-3.7980650000000002 +./xmlchange PLUMBER2SITE=UK-Gri +./xmlchange PTS_LON=-3.798065 ./xmlchange PTS_LAT=56.60722 ./xmlchange DATM_YR_END=2001 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_UK-Gri_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 178ff627b9..6d83e07c57 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-0.8583069999999999 -./xmlchange PTS_LAT=51.153529999999996 +./xmlchange PLUMBER2SITE=UK-Ham +./xmlchange PTS_LON=-0.858307 +./xmlchange PTS_LAT=51.15353 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_UK-Ham_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index d0f256f358..4237f25d27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-1.2666629999999999 +./xmlchange PLUMBER2SITE=UK-PL3 +./xmlchange PTS_LON=-1.266663 ./xmlchange PTS_LAT=51.450001 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_UK-PL3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 0bf6cf3313..1f32b6d98c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-AR1 ./xmlchange PTS_LON=-99.419983 ./xmlchange PTS_LAT=36.426701 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-AR1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 9751d08038..7e436a547c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-AR2 ./xmlchange PTS_LON=-99.597504 ./xmlchange PTS_LAT=36.635799 ./xmlchange DATM_YR_END=2011 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-AR2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index 3e4a6933bc..1a0fd06c8b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-ARM ./xmlchange PTS_LON=-97.4888 ./xmlchange PTS_LAT=36.605801 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-ARM_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index 1c193249b3..9ab42347b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Aud ./xmlchange PTS_LON=-110.509201 ./xmlchange PTS_LAT=31.5907 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Aud_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index b681aac49d..81591a2454 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-71.28808599999999 -./xmlchange PTS_LAT=44.064640000000004 +./xmlchange PLUMBER2SITE=US-Bar +./xmlchange PTS_LON=-71.288086 +./xmlchange PTS_LAT=44.06464 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Bar_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index a81ec9e93f..91e1976a9f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Bkg ./xmlchange PTS_LON=-96.836182 -./xmlchange PTS_LAT=44.345290999999996 +./xmlchange PTS_LAT=44.345291 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Bkg_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index 0d914e4416..5c09021706 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Blo ./xmlchange PTS_LON=-120.632751 ./xmlchange PTS_LAT=38.895302 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Blo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index f45ebc7076..49c70e98da 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Bo1 ./xmlchange PTS_LON=-88.290405 ./xmlchange PTS_LAT=40.006199 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Bo1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index 0ce199dd44..fc6a4841a9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Cop ./xmlchange PTS_LON=-109.389999 ./xmlchange PTS_LAT=38.09 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=24 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Cop_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 1f6c1a2438..2299cbf103 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-105.10189799999999 +./xmlchange PLUMBER2SITE=US-FPe +./xmlchange PTS_LON=-105.101898 ./xmlchange PTS_LAT=48.307701 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-FPe_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index 59ae899a7e..794d0584a2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-GLE ./xmlchange PTS_LON=-106.239899 ./xmlchange PTS_LAT=41.366501 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-GLE_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index 9a0d84e815..6cc34f40c2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-89.87350500000001 +./xmlchange PLUMBER2SITE=US-Goo +./xmlchange PTS_LON=-89.873505 ./xmlchange PTS_LAT=34.2547 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Goo_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index 0687c4cd3d..a016985d76 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Ha1 ./xmlchange PTS_LON=-72.171509 ./xmlchange PTS_LAT=42.5378 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ha1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1992" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index a0d98032eb..c36889758d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Ho1 ./xmlchange PTS_LON=-68.740204 ./xmlchange PTS_LAT=45.204102 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ho1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index 02d26509c2..fc3ab78d4f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-KS2 ./xmlchange PTS_LON=-80.671539 ./xmlchange PTS_LAT=28.608578 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-KS2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index 13ef4e69b4..d0ee0a8b7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Los ./xmlchange PTS_LON=-89.979187 ./xmlchange PTS_LAT=46.082699 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Los_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index 8a271026dd..12362f6d77 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-86.41308599999999 +./xmlchange PLUMBER2SITE=US-MMS +./xmlchange PTS_LON=-86.413086 ./xmlchange PTS_LAT=39.3232 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-MMS_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index a98dae73c4..a332c04808 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-MOz ./xmlchange PTS_LON=-92.200012 ./xmlchange PTS_LAT=38.74411 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-MOz_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index dc020bf1d1..97c8a61316 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Me2 ./xmlchange PTS_LON=-121.557404 ./xmlchange PTS_LAT=44.452301 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Me2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 77d787c3d4..eef9074dfe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-121.62240600000001 +./xmlchange PLUMBER2SITE=US-Me4 +./xmlchange PTS_LON=-121.622406 ./xmlchange PTS_LAT=44.499199 ./xmlchange DATM_YR_END=2000 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Me4_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index 389ef600e5..7591643f86 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Me6 ./xmlchange PTS_LON=-121.607803 ./xmlchange PTS_LAT=44.323299 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Me6_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index 6cc05da64f..66e97faf89 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Myb ./xmlchange PTS_LON=-121.765106 ./xmlchange PTS_LAT=38.049801 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Myb_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index 773ca669b1..6ccba5ae4e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-NR1 ./xmlchange PTS_LON=-105.546402 ./xmlchange PTS_LAT=40.032902 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-NR1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index f2adadd3ac..54bbcbe8de 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-96.47659300000001 +./xmlchange PLUMBER2SITE=US-Ne1 +./xmlchange PTS_LON=-96.476593 ./xmlchange PTS_LAT=41.1651 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ne1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index 15ed24bdee..0587fd1932 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Ne2 ./xmlchange PTS_LON=-96.470093 -./xmlchange PTS_LAT=41.164902000000005 +./xmlchange PTS_LAT=41.164902 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ne2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index 631bf243e4..66bcf6d25d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Ne3 ./xmlchange PTS_LON=-96.439697 ./xmlchange PTS_LAT=41.179699 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ne3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index dd400a9257..76bfb84b9f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-PFa ./xmlchange PTS_LON=-90.272308 ./xmlchange PTS_LAT=45.9459 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-PFa_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 28acc5f402..f3c9e49740 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Prr ./xmlchange PTS_LON=-147.487595 ./xmlchange PTS_LAT=65.123703 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=32400 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Prr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index 37e05304a8..a10cb0956a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-SP1 ./xmlchange PTS_LON=-82.218781 ./xmlchange PTS_LAT=29.73807 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-SP1_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index a4ea7a35ac..7b7a589af4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-SP2 ./xmlchange PTS_LON=-82.244812 ./xmlchange PTS_LAT=29.764799 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-SP2_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index 76c00c8a36..882c94c80f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-SP3 ./xmlchange PTS_LON=-82.163269 ./xmlchange PTS_LAT=29.75477 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-SP3_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index 804a5f9884..7fea8792e6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-SRG ./xmlchange PTS_LON=-110.827698 ./xmlchange PTS_LAT=31.7894 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-SRG_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index 9b379b1edb..3ba018a2b1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-SRM ./xmlchange PTS_LON=-110.865997 ./xmlchange PTS_LAT=31.8214 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-SRM_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 0fe6c91305..636e532f38 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Syv ./xmlchange PTS_LON=-89.347717 ./xmlchange PTS_LAT=46.242001 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Syv_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index e97bac9028..497385372e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Ton ./xmlchange PTS_LON=-120.966003 ./xmlchange PTS_LAT=38.431599 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Ton_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index 49ad7cddd2..f212f4bc0f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Tw4 ./xmlchange PTS_LON=-121.641403 ./xmlchange PTS_LAT=38.103001 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Tw4_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index 447906c4fc..74035ea108 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Twt ./xmlchange PTS_LON=-121.653107 ./xmlchange PTS_LAT=38.1087 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Twt_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 1b3ee51b17..08f9f17a5a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-UMB ./xmlchange PTS_LON=-84.713806 ./xmlchange PTS_LAT=45.559799 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-UMB_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index 099e07e301..e997931652 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -1,10 +1,10 @@ -./xmlchange PTS_LON=-120.95072900000001 +./xmlchange PLUMBER2SITE=US-Var +./xmlchange PTS_LON=-120.950729 ./xmlchange PTS_LAT=38.4133 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Var_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index de5a646543..55647b78c0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-WCr ./xmlchange PTS_LON=-90.079895 ./xmlchange PTS_LAT=45.805901 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-WCr_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index f706a2e79a..51fadcc9f6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Whs ./xmlchange PTS_LON=-110.0522 ./xmlchange PTS_LAT=31.743799 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Whs_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index 0fc65819c2..5d95ef3e36 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=US-Wkg ./xmlchange PTS_LON=-109.941895 ./xmlchange PTS_LAT=31.7365 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_US-Wkg_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 7c2dfed5c9..6fe9e9c989 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=ZA-Kru ./xmlchange PTS_LON=31.496901 ./xmlchange PTS_LAT=-25.019699 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ZA-Kru_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index 825675dc9b..ff19816490 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -1,10 +1,10 @@ +./xmlchange PLUMBER2SITE=ZM-Mon ./xmlchange PTS_LON=23.252781 ./xmlchange PTS_LAT=-15.437778 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "fsurdat='\$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_ZM-Mon_hist_2000_16pfts_c240326.nc' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams From 6f8c4d779fd320cdf06df9c337e8e1125d544049 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Fri, 28 Jun 2024 16:13:27 -0600 Subject: [PATCH 35/81] reformatting pt2 --- python/ctsm/site_and_regional/plumber2_usermods.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/python/ctsm/site_and_regional/plumber2_usermods.py b/python/ctsm/site_and_regional/plumber2_usermods.py index 2fe183fb77..0a083e1dd7 100644 --- a/python/ctsm/site_and_regional/plumber2_usermods.py +++ b/python/ctsm/site_and_regional/plumber2_usermods.py @@ -58,13 +58,7 @@ def write_usermods( "./xmlchange DATM_YR_END=" + str(end_year) + "\n" "./xmlchange START_TOD=" + str(start_tod) + "\n" "./xmlchange ATM_NCPL=" + str(atm_ncpl) + "\n" - "\n" # TODO, get working for CTSM5.1: - # remove the above line as it's redundant after PLUMBER2SITE is added - # Alternatively, we can take this out of default/user_nl_clm - # since doing it this way is works fine TODO for 5.2 - "echo \"fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_" - + site - + "_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' \" >> user_nl_clm \n" + "\n" 'echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/' + site + "/CLM1PT_data/CTSM_DATM_" From da6e20615435ee4108f9cab6803bf7161afcf6a0 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 2 Jul 2024 12:05:33 -0600 Subject: [PATCH 36/81] fix for plumber file formats --- cime_config/buildnml | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index acc74868e0..7d3e2b4770 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -182,7 +182,9 @@ def buildnml(case, caseroot, compname): clm_phys = case.get_value("CLM_PHYSICS_VERSION") config_cache_text = _config_cache_template.format(clm_phys=clm_phys) - config_cache_path = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") + config_cache_path = os.path.join( + caseroot, "Buildconf", compname + "conf", "config_cache.xml" + ) with open(config_cache_path, "w") as config_cache_file: config_cache_file.write(config_cache_text) @@ -224,16 +226,22 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if ("NEON" in clm_usrdat_name) or ("PLUMBER" in clm_usrdat_name): - if clm_force_coldstart == "off": - if ("_transient" in clm_nml_use_case) and ( - re.fullmatch(r"\w\w\w\w\.transient", casename) is None - or clm_usrdat_name is "NEON.PRISM" - ): - logger.warning( - "WARNING: Do you have appropriate initial conditions for this simulation?" - + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case" - ) + if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": + if ("_transient" in clm_nml_use_case) and ( + re.fullmatch(r"\w\w\w\w\.transient", casename) is None + ): + logger.warning( + "WARNING: Do you have appropriate initial conditions for this simulation?" + + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case" + ) + if "PLUMBER" in clm_usrdat_name and clm_force_coldstart == "off": + if ("_transient" in clm_nml_use_case) and ( + re.fullmatch(r"\w\w-\w\w\w\.transient", casename) is None + ): + logger.warning( + "WARNING: Do you have appropriate initial conditions for this simulation?" + + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case" + ) if comp_atm != "datm": nomeg = "-no-megan" @@ -302,7 +310,9 @@ def buildnml(case, caseroot, compname): lndfrac_file = os.path.join(lnd_domain_path, lnd_domain_file) lndfrac_setting = "-lnd_frac " + lndfrac_file - config_cache_file = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") + config_cache_file = os.path.join( + caseroot, "Buildconf", compname + "conf", "config_cache.xml" + ) # ----------------------------------------------------- # Clear out old data @@ -317,7 +327,6 @@ def buildnml(case, caseroot, compname): ninst = int(ninst_lnd) for inst_counter in range(1, ninst + 1): - # determine instance string inst_string = "" if ninst > 1: @@ -365,7 +374,9 @@ def buildnml(case, caseroot, compname): break if not os.path.exists(os.path.join(rundir, clm_startfile)): - logger.warning("WARNING: Could NOT find a start file to use using" + clm_startfile) + logger.warning( + "WARNING: Could NOT find a start file to use using" + clm_startfile + ) clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile) else: clm_icfile = "" @@ -376,7 +387,9 @@ def buildnml(case, caseroot, compname): user_nl_file = os.path.join(caseroot, "user_nl_clm" + inst_string) namelist_infile = os.path.join(ctsmconf, "namelist") - create_namelist_infile(case, user_nl_file, namelist_infile, "\n".join(infile_lines)) + create_namelist_infile( + case, user_nl_file, namelist_infile, "\n".join(infile_lines) + ) cmd = os.path.join(lnd_root, "bld", "build-namelist") @@ -439,7 +452,6 @@ def buildnml(case, caseroot, compname): ############################################################################### def _main_func(): - caseroot = parse_input(sys.argv) with Case(caseroot) as case: compname = case.get_value("COMP_LND") From 926299cf96270f17175c6649165a9d1985f755f6 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 2 Jul 2024 12:09:37 -0600 Subject: [PATCH 37/81] fix black issue and neon.prism clm_usrdat_name --- cime_config/buildnml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 7d3e2b4770..370291fa70 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -182,9 +182,7 @@ def buildnml(case, caseroot, compname): clm_phys = case.get_value("CLM_PHYSICS_VERSION") config_cache_text = _config_cache_template.format(clm_phys=clm_phys) - config_cache_path = os.path.join( - caseroot, "Buildconf", compname + "conf", "config_cache.xml" - ) + config_cache_path = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml" ) with open(config_cache_path, "w") as config_cache_file: config_cache_file.write(config_cache_text) @@ -229,6 +227,7 @@ def buildnml(case, caseroot, compname): if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w\w\w\.transient", casename) is None + or clm_usrdat_name is "NEON.PRISM" ): logger.warning( "WARNING: Do you have appropriate initial conditions for this simulation?" @@ -310,9 +309,7 @@ def buildnml(case, caseroot, compname): lndfrac_file = os.path.join(lnd_domain_path, lnd_domain_file) lndfrac_setting = "-lnd_frac " + lndfrac_file - config_cache_file = os.path.join( - caseroot, "Buildconf", compname + "conf", "config_cache.xml" - ) + config_cache_file = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") # ----------------------------------------------------- # Clear out old data @@ -374,9 +371,7 @@ def buildnml(case, caseroot, compname): break if not os.path.exists(os.path.join(rundir, clm_startfile)): - logger.warning( - "WARNING: Could NOT find a start file to use using" + clm_startfile - ) + logger.warning("WARNING: Could NOT find a start file to use using" + clm_startfile) clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile) else: clm_icfile = "" @@ -387,9 +382,7 @@ def buildnml(case, caseroot, compname): user_nl_file = os.path.join(caseroot, "user_nl_clm" + inst_string) namelist_infile = os.path.join(ctsmconf, "namelist") - create_namelist_infile( - case, user_nl_file, namelist_infile, "\n".join(infile_lines) - ) + create_namelist_infile(case, user_nl_file, namelist_infile, "\n".join(infile_lines)) cmd = os.path.join(lnd_root, "bld", "build-namelist") From f6a0749845f612b55301ecdc93dc0823d506a929 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 2 Jul 2024 12:49:50 -0600 Subject: [PATCH 38/81] revert everything else to pre-black-fail --- cime_config/buildnml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 370291fa70..539be911e6 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -182,7 +182,7 @@ def buildnml(case, caseroot, compname): clm_phys = case.get_value("CLM_PHYSICS_VERSION") config_cache_text = _config_cache_template.format(clm_phys=clm_phys) - config_cache_path = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml" ) + config_cache_path = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") with open(config_cache_path, "w") as config_cache_file: config_cache_file.write(config_cache_text) @@ -324,6 +324,7 @@ def buildnml(case, caseroot, compname): ninst = int(ninst_lnd) for inst_counter in range(1, ninst + 1): + # determine instance string inst_string = "" if ninst > 1: @@ -445,6 +446,7 @@ def buildnml(case, caseroot, compname): ############################################################################### def _main_func(): + caseroot = parse_input(sys.argv) with Case(caseroot) as case: compname = case.get_value("COMP_LND") From 1548af3bdca0e23de641feffbed59b6094737e37 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:25:11 -0600 Subject: [PATCH 39/81] Update buildnml PLUMBER --> PLUMBER2 --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 539be911e6..46812602df 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -233,7 +233,7 @@ def buildnml(case, caseroot, compname): "WARNING: Do you have appropriate initial conditions for this simulation?" + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case" ) - if "PLUMBER" in clm_usrdat_name and clm_force_coldstart == "off": + if "PLUMBER2" in clm_usrdat_name and clm_force_coldstart == "off": if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"\w\w-\w\w\w\.transient", casename) is None ): From e9e7eaf37582cf10dee394f4dbd3a7e1ba592883 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Wed, 7 Aug 2024 10:53:15 -0600 Subject: [PATCH 40/81] typo fix in config_component.xml --- cime_config/config_component.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 1fc7a3a3a1..3951356df9 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -356,7 +356,7 @@ cold start (finidat will be set to blanks). A value of on forces the model to spin up from a cold-start (arbitrary initial conditions). Setting this value in the xml file will take - precedence over any settings for finidat in the $CASEROOT/user_nl_ctsm file. + precedence over any settings for finidat in the $CASEROOT/user_nl_clm file. From c8447b8acb8c13472f49d46aae8d07133cc3496f Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 8 Aug 2024 12:04:49 -0600 Subject: [PATCH 41/81] Update plumber2_usermods.py to include new xml var and remove additional stream that is now in cdeps --- python/ctsm/site_and_regional/plumber2_usermods.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/python/ctsm/site_and_regional/plumber2_usermods.py b/python/ctsm/site_and_regional/plumber2_usermods.py index 0a083e1dd7..d98899771b 100644 --- a/python/ctsm/site_and_regional/plumber2_usermods.py +++ b/python/ctsm/site_and_regional/plumber2_usermods.py @@ -56,18 +56,10 @@ def write_usermods( "./xmlchange PTS_LON=" + str(lon) + "\n" "./xmlchange PTS_LAT=" + str(lat) + "\n" "./xmlchange DATM_YR_END=" + str(end_year) + "\n" + "./xmlchange DATM_YR_START_FILENAME=" + str(start_year) + "\n" "./xmlchange START_TOD=" + str(start_tod) + "\n" "./xmlchange ATM_NCPL=" + str(atm_ncpl) + "\n" "\n" - 'echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/' - + site - + "/CLM1PT_data/CTSM_DATM_" - + site - + "_" - + str(start_year) - + "-" - + str(end_year) - + '.nc " >> user_nl_datm_streams \n' 'echo "presaero.SSP3-7.0:year_first=' + str(start_year) + '" >> user_nl_datm_streams \n' 'echo "presaero.SSP3-7.0:year_last=' + str(end_year) + '" >> user_nl_datm_streams \n' 'echo "presaero.SSP3-7.0:year_align=' + str(start_year) + '" >> user_nl_datm_streams \n' From 43f8aeefc0bff8e4cae2ac0a58f510f48fd50bf6 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 8 Aug 2024 12:05:54 -0600 Subject: [PATCH 42/81] fix typo in buildnml --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 46812602df..893f0933c7 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -372,7 +372,7 @@ def buildnml(case, caseroot, compname): break if not os.path.exists(os.path.join(rundir, clm_startfile)): - logger.warning("WARNING: Could NOT find a start file to use using" + clm_startfile) + logger.warning("WARNING: Could NOT find a start file named" + clm_startfile) clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile) else: clm_icfile = "" From dc6773742b7f0ca30ecf90478fd98e7419d06730 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 8 Aug 2024 12:15:41 -0600 Subject: [PATCH 43/81] updated shell commands with new xml var and file moved to cdeps --- cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands | 2 +- 170 files changed, 170 insertions(+), 170 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index d7f8707812..f297937768 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-66.459808 ./xmlchange PTS_LAT=-33.464802 ./xmlchange DATM_YR_END=2010 +./xmlchange DATM_YR_START_FILENAME=2010 ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index dc0750224f..319c52a95d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.3175 ./xmlchange PTS_LAT=47.116669 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index f3eae9a24e..afadee1c1e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=133.248993 ./xmlchange PTS_LAT=-22.283001 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2011 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 9e44c8232c..40187f1b46 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=145.427155 ./xmlchange PTS_LAT=-16.23819 ./xmlchange DATM_YR_END=2015 +./xmlchange DATM_YR_START_FILENAME=2010 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index 114544e9b5..fc3b037ecc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=140.589127 ./xmlchange PTS_LAT=-34.00206 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2011 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index 7af2976c83..6710134c78 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=145.446854 ./xmlchange PTS_LAT=-16.103279 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2010 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 8c75b3de45..a2022818c6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=150.722473 ./xmlchange PTS_LAT=-33.613297 ./xmlchange DATM_YR_END=2018 +./xmlchange DATM_YR_START_FILENAME=2013 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index 44171b3425..28b5b4b446 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=131.3181 ./xmlchange PTS_LAT=-14.0633 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=2009 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 699b74900a..96acb7b7cf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=131.388 ./xmlchange PTS_LAT=-14.159283 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2010 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index a2a4686230..da520bb88e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=132.370605 ./xmlchange PTS_LAT=-15.2588 ./xmlchange DATM_YR_END=2015 +./xmlchange DATM_YR_START_FILENAME=2011 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index 7d9d557087..a5ccf45884 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=148.474594 ./xmlchange PTS_LAT=-23.8587 ./xmlchange DATM_YR_END=2013 +./xmlchange DATM_YR_START_FILENAME=2012 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 26bd398dc1..637c921fae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=120.654099 ./xmlchange PTS_LAT=-30.191299 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2013 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 61d3c3eb01..e02f3482ed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=115.650002 ./xmlchange PTS_LAT=-31.375 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2012 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 7cac687aa3..448f24cc4f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=131.149994 ./xmlchange PTS_LAT=-12.4952 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index 7f1a885344..6e69bbc5d2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=130.794495 ./xmlchange PTS_LAT=-13.17904 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2016 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 4016a12e52..c3962c1b33 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=142.816803 ./xmlchange PTS_LAT=-38.532341 ./xmlchange DATM_YR_END=2010 +./xmlchange DATM_YR_START_FILENAME=2009 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index 193f3cc5dd..fc5ecba950 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=145.575897 ./xmlchange PTS_LAT=-36.649899 ./xmlchange DATM_YR_END=2016 +./xmlchange DATM_YR_START_FILENAME=2011 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index f7f4921746..6e640a50fa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=145.630096 ./xmlchange PTS_LAT=-17.1175 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2014 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index d1dae3a306..1f48d3060f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=152.877808 ./xmlchange PTS_LAT=-27.3881 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2011 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index d0e4cdf638..949257e09f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=133.350204 ./xmlchange PTS_LAT=-17.1507 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2010 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 3c878a3ae9..ca7b84c598 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=133.639999 ./xmlchange PTS_LAT=-22.287001 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2013 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index 8e01ca6869..5ad2d9dce2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=148.151703 ./xmlchange PTS_LAT=-35.656601 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index 5bde37cdc7..250e8f049e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=145.029404 ./xmlchange PTS_LAT=-36.673199 ./xmlchange DATM_YR_END=2016 +./xmlchange DATM_YR_START_FILENAME=2015 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index 76311551ed..c96c57a93f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=146.654495 ./xmlchange PTS_LAT=-43.09502 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2016 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index e7c1c495fc..cc5b8909d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=146.290695 ./xmlchange PTS_LAT=-34.9893 ./xmlchange DATM_YR_END=2017 +./xmlchange DATM_YR_START_FILENAME=2011 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index 4cb0c5af5c..93bf56051e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=4.52056 ./xmlchange PTS_LAT=51.309166 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 5ce5a904f5..597961e426 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=4.74613 ./xmlchange PTS_LAT=50.55159 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index 0e4e802d91..2a97262b87 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=5.99805 ./xmlchange PTS_LAT=50.305069 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=1997 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 114becfc06..ec8d9bc33a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-54.971436 ./xmlchange PTS_LAT=-3.018029 ./xmlchange DATM_YR_END=2003 +./xmlchange DATM_YR_START_FILENAME=2001 ./xmlchange START_TOD=14400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 7d0681f988..64af7dc90f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=23.560329 ./xmlchange PTS_LAT=-19.9165 ./xmlchange DATM_YR_END=2000 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index 47f8762dca..9b4f8d74ec 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-98.483887 ./xmlchange PTS_LAT=55.8792 ./xmlchange DATM_YR_END=2003 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index c787c85af0..5563971afc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-98.524689 ./xmlchange PTS_LAT=55.9058 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index 5e4247d5ee..d6ddd551af 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-98.380615 ./xmlchange PTS_LAT=55.914398 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index bddbef5bb3..49a320a37d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-98.484985 ./xmlchange PTS_LAT=55.863098 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index 908a798b98..c5097e87ec 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-98.964417 ./xmlchange PTS_LAT=55.916698 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 5734053c2b..583c102ae0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-99.948303 ./xmlchange PTS_LAT=56.635799 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index b68de255cb..892029da56 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-74.03653 ./xmlchange PTS_LAT=49.267078 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index 8829dfb112..3f61fbd901 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-74.342102 ./xmlchange PTS_LAT=49.692501 ./xmlchange DATM_YR_END=2010 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index f227bbb636..49de04986c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-105.817596 ./xmlchange PTS_LAT=54.485001 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 8083656498..5cc0da8be1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-105.877502 ./xmlchange PTS_LAT=54.253899 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index 0c48e83347..3f94c02ca9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-106.00531 ./xmlchange PTS_LAT=54.091599 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index 8a769f83ff..ca0ad87518 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=8.41044 ./xmlchange PTS_LAT=47.21022 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index 4a70829314..254c30865a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=9.85592 ./xmlchange PTS_LAT=46.815334 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=1997 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 706c335415..617ed84d7c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=8.53778 ./xmlchange PTS_LAT=47.115833 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2007 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index 7dacd7a573..6fb4f3a844 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=7.73194 ./xmlchange PTS_LAT=47.285831 ./xmlchange DATM_YR_END=2008 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index ac02990ed7..f6da50bde1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=128.095795 ./xmlchange PTS_LAT=42.4025 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 6e2582d175..648c844408 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=123.509201 ./xmlchange PTS_LAT=44.593399 ./xmlchange DATM_YR_END=2009 +./xmlchange DATM_YR_START_FILENAME=2008 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 3b9c16a5f4..9616c9d792 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=91.066399 ./xmlchange PTS_LAT=30.497801 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index f125b585da..c30e651178 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=112.536102 ./xmlchange PTS_LAT=23.1733 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index ca85d11837..d46dec7f7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=116.2836 ./xmlchange PTS_LAT=42.0467 ./xmlchange DATM_YR_END=2008 +./xmlchange DATM_YR_START_FILENAME=2007 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 8c557f6c07..91d489b75b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=101.18 ./xmlchange PTS_LAT=37.369999 ./xmlchange DATM_YR_END=2003 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index c0599132ef..484175aa93 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=115.058098 ./xmlchange PTS_LAT=26.7414 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index d0ee8f1b57..7c753c4183 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=14.77035 ./xmlchange PTS_LAT=49.024651 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2007 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index 2a0bb1ed7e..55c14aac5f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.86694 ./xmlchange PTS_LAT=50.141941 ./xmlchange DATM_YR_END=1999 +./xmlchange DATM_YR_START_FILENAME=1997 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index 9e42e4029f..d57138be71 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=10.9143 ./xmlchange PTS_LAT=51.100101 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2001 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 5ae694eca6..5a27ee5e20 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=13.51253 ./xmlchange PTS_LAT=50.949471 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index cfdacd4388..55124b7900 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=10.453 ./xmlchange PTS_LAT=51.079166 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 2b4760861f..860b100586 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=13.52238 ./xmlchange PTS_LAT=50.893059 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index ace23c6499..b94a90e206 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=10.65547 ./xmlchange PTS_LAT=51.275311 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index 81d983ac51..e633f65987 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=13.72129 ./xmlchange PTS_LAT=50.786659 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index 99b14107c6..c6808b0bf1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=6.44965 ./xmlchange PTS_LAT=50.870625 ./xmlchange DATM_YR_END=2010 +./xmlchange DATM_YR_START_FILENAME=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index 70c6009607..639a2c5195 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.3275 ./xmlchange PTS_LAT=47.806389 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index 33b2870a58..66055b2ee2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=13.56694 ./xmlchange PTS_LAT=50.963612 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=1998 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index 947d965270..de0ad17a95 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.45753 ./xmlchange PTS_LAT=50.453499 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index a34d0eb77a..581fd31324 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=9.58722 ./xmlchange PTS_LAT=56.4842 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index 06f512c753..b1a1955519 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=12.0833 ./xmlchange PTS_LAT=55.6833 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index bb2be42089..86fcb0ba10 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=12.09722 ./xmlchange PTS_LAT=55.530281 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index efe8c0ad42..046e9559d2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.64464 ./xmlchange PTS_LAT=55.48587 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=1997 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index cca198c906..234c5e8ba7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-20.550293 ./xmlchange PTS_LAT=74.473282 ./xmlchange DATM_YR_END=2013 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 9cc4725f98..9947bb0014 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-0.318817 ./xmlchange PTS_LAT=39.34597 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=1999 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 03a6ccf482..235ddfbb32 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-0.315277 ./xmlchange PTS_LAT=39.275558 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index f36c6be9fc..c0c83dbbd2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-5.773346 ./xmlchange PTS_LAT=39.941502 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 2a701bb99f..454de1a378 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-2.96582 ./xmlchange PTS_LAT=37.097935 ./xmlchange DATM_YR_END=2007 +./xmlchange DATM_YR_START_FILENAME=2007 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index e7971529d9..0de3a761a7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=1.4485 ./xmlchange PTS_LAT=42.15218 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 7ac714599a..1861c4a0b6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=24.295 ./xmlchange PTS_LAT=61.8475 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=1996 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index 339a244afa..9f7b8a0763 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=27.295031 ./xmlchange PTS_LAT=69.140694 ./xmlchange DATM_YR_END=2002 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index dea60aca09..14c28c1475 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=24.209181 ./xmlchange PTS_LAT=67.9972 ./xmlchange DATM_YR_END=2009 +./xmlchange DATM_YR_START_FILENAME=2007 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index 08773c8443..7eccb754fb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=26.637831 ./xmlchange PTS_LAT=67.361862 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2008 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 550ce300cd..76a71ab3b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=2.78014 ./xmlchange PTS_LAT=48.476398 ./xmlchange DATM_YR_END=2013 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index 169e85a270..5c575b0e97 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=1.95191 ./xmlchange PTS_LAT=48.844219 ./xmlchange DATM_YR_END=2013 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index 18a9e57b29..1d8ab25532 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=7.06556 ./xmlchange PTS_LAT=48.67416 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=1997 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index ee89868fa1..6b9eb48062 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-0.769287 ./xmlchange PTS_LAT=44.71711 ./xmlchange DATM_YR_END=2008 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index c5025aba8b..000fc6d746 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=2.73583 ./xmlchange PTS_LAT=45.643059 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index 26581437b9..a851919f73 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=2.73703 ./xmlchange PTS_LAT=45.639191 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index 13fab2f770..1981d675fc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=3.59583 ./xmlchange PTS_LAT=43.74139 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index bafc0737b8..1f10f4a2e1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-52.924866 ./xmlchange PTS_LAT=5.278772 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index 98e5672dc2..54b635a2a2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=19.601299 ./xmlchange PTS_LAT=46.691101 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index a71ecdf659..13ac0e386f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=114.036392 ./xmlchange PTS_LAT=-2.345 ./xmlchange DATM_YR_END=2003 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index 98d668df9e..2bd80343c3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-6.918152 ./xmlchange PTS_LAT=52.858791 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index edb036e775..4f27411509 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-8.751801 ./xmlchange PTS_LAT=51.986691 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index 3a4195c030..aa7fef51ae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=13.60516 ./xmlchange PTS_LAT=41.904099 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index ada711ab6e..0c620a348c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=14.95744 ./xmlchange PTS_LAT=40.5238 ./xmlchange DATM_YR_END=2010 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index 9ff3031f4d..831b7897c0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=12.02656 ./xmlchange PTS_LAT=42.380409 ./xmlchange DATM_YR_END=2013 +./xmlchange DATM_YR_START_FILENAME=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index 2041d6983d..dfae27f215 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=12.02604 ./xmlchange PTS_LAT=42.37722 ./xmlchange DATM_YR_END=2013 +./xmlchange DATM_YR_START_FILENAME=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index 50253ccc6b..a3a2ab6c25 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=12.0222 ./xmlchange PTS_LAT=42.380001 ./xmlchange DATM_YR_END=2013 +./xmlchange DATM_YR_START_FILENAME=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index 06e653c0b9..eb817ab43c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=13.58814 ./xmlchange PTS_LAT=41.849361 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2007 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index b7b1ae449d..cfad8adb35 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=12.37611 ./xmlchange PTS_LAT=41.70525 ./xmlchange DATM_YR_END=2008 +./xmlchange DATM_YR_START_FILENAME=2001 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index 873293a7aa..125257acd7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=8.63358 ./xmlchange PTS_LAT=45.812641 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index b8efb6955e..bca26018b9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=7.58259 ./xmlchange PTS_LAT=45.15258 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index a50e9dc664..87f8e9d947 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.28132 ./xmlchange PTS_LAT=45.9562 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index 0c60de60ba..ab42d7a3d8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.04583 ./xmlchange PTS_LAT=46.014679 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index 34c3d12aa2..8cf5fdd6d0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.70334 ./xmlchange PTS_LAT=46.114021 ./xmlchange DATM_YR_END=2003 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index bd8d0e486c..8b12cb84db 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=8.15117 ./xmlchange PTS_LAT=40.606178 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index 3084a49d8a..c8b4f77f4d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.09109 ./xmlchange PTS_LAT=44.690189 ./xmlchange DATM_YR_END=2002 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index f82e0b8eb9..629382cea8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=9.06104 ./xmlchange PTS_LAT=45.200871 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index 80927456e8..ebf7cdb500 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.43369 ./xmlchange PTS_LAT=46.586861 ./xmlchange DATM_YR_END=2013 +./xmlchange DATM_YR_START_FILENAME=2010 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index 209a0c032d..b400216f9b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.93001 ./xmlchange PTS_LAT=42.408119 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index 55e5f4f128..195c0fdbc9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=11.92093 ./xmlchange PTS_LAT=42.390259 ./xmlchange DATM_YR_END=2008 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index bd1211a9c7..d981029a77 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=10.29095 ./xmlchange PTS_LAT=43.732029 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index a0aa3f3aa5..c40b2d8f71 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=10.28444 ./xmlchange PTS_LAT=43.727859 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 17be0e9534..c93dfef557 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=137.078796 ./xmlchange PTS_LAT=35.2617 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index fd82f6a049..ccb1290e78 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=4.927 ./xmlchange PTS_LAT=51.971001 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index e4712093fa..08eb58d8a1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=5.0713 ./xmlchange PTS_LAT=52.240349 ./xmlchange DATM_YR_END=2011 +./xmlchange DATM_YR_START_FILENAME=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index d825ace2ba..a09cf39408 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=5.74356 ./xmlchange PTS_LAT=52.16658 ./xmlchange DATM_YR_END=2013 +./xmlchange DATM_YR_START_FILENAME=1997 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index 80bb1b37c5..eb79334eeb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=16.309401 ./xmlchange PTS_LAT=52.762199 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index b56b6968f1..4186dea491 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-8.601807 ./xmlchange PTS_LAT=38.6394 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index 2d35f26a06..36a1899bfc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-8.000061 ./xmlchange PTS_LAT=38.540642 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index b02616ee02..e2986dfac8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-8.024536 ./xmlchange PTS_LAT=38.476501 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index dff0478e08..f5172ddb53 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=161.341431 ./xmlchange PTS_LAT=68.613037 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index d90a4af0bc..69bab319bc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=32.922081 ./xmlchange PTS_LAT=56.461529 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index 1d42ea947f..27144db3cb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=89.3508 ./xmlchange PTS_LAT=60.8008 ./xmlchange DATM_YR_END=2003 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index 2b471ebc27..6d245703d6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=30.4783 ./xmlchange PTS_LAT=13.2829 ./xmlchange DATM_YR_END=2009 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index 34a53f5533..0a426dee38 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=19.55669 ./xmlchange PTS_LAT=64.181969 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index 6cd7cb38f4..c016bf89a7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-3.798065 ./xmlchange PTS_LAT=56.60722 ./xmlchange DATM_YR_END=2001 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 6d83e07c57..f92b9a6d69 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-0.858307 ./xmlchange PTS_LAT=51.15353 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index 4237f25d27..10b82dee40 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-1.266663 ./xmlchange PTS_LAT=51.450001 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 1f32b6d98c..8b3bb18871 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-99.419983 ./xmlchange PTS_LAT=36.426701 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=2010 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 7e436a547c..0eeaef4fe2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-99.597504 ./xmlchange PTS_LAT=36.635799 ./xmlchange DATM_YR_END=2011 +./xmlchange DATM_YR_START_FILENAME=2010 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index 1a0fd06c8b..4045912f3c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-97.4888 ./xmlchange PTS_LAT=36.605801 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index 9ab42347b2..043730b19e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-110.509201 ./xmlchange PTS_LAT=31.5907 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 81591a2454..4fb0562433 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-71.288086 ./xmlchange PTS_LAT=44.06464 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 91e1976a9f..a05f46e871 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-96.836182 ./xmlchange PTS_LAT=44.345291 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index 5c09021706..fb79abb36e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-120.632751 ./xmlchange PTS_LAT=38.895302 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index 49c70e98da..b6e243115f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-88.290405 ./xmlchange PTS_LAT=40.006199 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=1997 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index fc6a4841a9..0957a02037 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-109.389999 ./xmlchange PTS_LAT=38.09 ./xmlchange DATM_YR_END=2003 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 2299cbf103..bd5760bfc0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-105.101898 ./xmlchange PTS_LAT=48.307701 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index 794d0584a2..fc1b2c4fba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-106.239899 ./xmlchange PTS_LAT=41.366501 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2009 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index 6cc34f40c2..be9ff715aa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-89.873505 ./xmlchange PTS_LAT=34.2547 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index a016985d76..bb97980e53 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-72.171509 ./xmlchange PTS_LAT=42.5378 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=1992 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1992" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1992" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index c36889758d..803711f8af 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-68.740204 ./xmlchange PTS_LAT=45.204102 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=1996 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index fc3ab78d4f..74ad2113d9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-80.671539 ./xmlchange PTS_LAT=28.608578 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2003 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index d0ee0a8b7d..dbc8d3b004 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-89.979187 ./xmlchange PTS_LAT=46.082699 ./xmlchange DATM_YR_END=2008 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index 12362f6d77..8e8804a887 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-86.413086 ./xmlchange PTS_LAT=39.3232 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=1999 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index a332c04808..223e43a3d6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-92.200012 ./xmlchange PTS_LAT=38.74411 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index 97c8a61316..8555ceb993 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-121.557404 ./xmlchange PTS_LAT=44.452301 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index eef9074dfe..b191f984a5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-121.622406 ./xmlchange PTS_LAT=44.499199 ./xmlchange DATM_YR_END=2000 +./xmlchange DATM_YR_START_FILENAME=1996 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index 7591643f86..8ffbbe4855 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-121.607803 ./xmlchange PTS_LAT=44.323299 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2011 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index 66e97faf89..2d3103546a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-121.765106 ./xmlchange PTS_LAT=38.049801 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2011 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index 6ccba5ae4e..cd795160d0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-105.546402 ./xmlchange PTS_LAT=40.032902 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=1999 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index 54bbcbe8de..4b205b471d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-96.476593 ./xmlchange PTS_LAT=41.1651 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index 0587fd1932..beca45f248 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-96.470093 ./xmlchange PTS_LAT=41.164902 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index 66bcf6d25d..59644ec285 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-96.439697 ./xmlchange PTS_LAT=41.179699 ./xmlchange DATM_YR_END=2012 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 76bfb84b9f..979dd2adbe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-90.272308 ./xmlchange PTS_LAT=45.9459 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=1995 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1995" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index f3c9e49740..34949905d4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-147.487595 ./xmlchange PTS_LAT=65.123703 ./xmlchange DATM_YR_END=2013 +./xmlchange DATM_YR_START_FILENAME=2011 ./xmlchange START_TOD=32400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index a10cb0956a..07c1611661 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-82.218781 ./xmlchange PTS_LAT=29.73807 ./xmlchange DATM_YR_END=2005 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index 7b7a589af4..0640843357 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-82.244812 ./xmlchange PTS_LAT=29.764799 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index 882c94c80f..559f2e9282 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-82.163269 ./xmlchange PTS_LAT=29.75477 ./xmlchange DATM_YR_END=2004 +./xmlchange DATM_YR_START_FILENAME=1999 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index 7fea8792e6..25269ecc91 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-110.827698 ./xmlchange PTS_LAT=31.7894 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2009 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index 3ba018a2b1..97c155f639 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-110.865997 ./xmlchange PTS_LAT=31.8214 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2004 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 636e532f38..f78805c4d8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-89.347717 ./xmlchange PTS_LAT=46.242001 ./xmlchange DATM_YR_END=2008 +./xmlchange DATM_YR_START_FILENAME=2002 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index 497385372e..81a47579f4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-120.966003 ./xmlchange PTS_LAT=38.431599 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2001 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index f212f4bc0f..6a76794659 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-121.641403 ./xmlchange PTS_LAT=38.103001 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index 74035ea108..0a36252097 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-121.653107 ./xmlchange PTS_LAT=38.1087 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2010 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 08f9f17a5a..6587b7967c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-84.713806 ./xmlchange PTS_LAT=45.559799 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index e997931652..ecdf5c95e3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-120.950729 ./xmlchange PTS_LAT=38.4133 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2001 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index 55647b78c0..4f2ca3a65e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-90.079895 ./xmlchange PTS_LAT=45.805901 ./xmlchange DATM_YR_END=2006 +./xmlchange DATM_YR_START_FILENAME=1999 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 51fadcc9f6..458db116f3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-110.0522 ./xmlchange PTS_LAT=31.743799 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2008 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index 5d95ef3e36..0870b9233d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=-109.941895 ./xmlchange PTS_LAT=31.7365 ./xmlchange DATM_YR_END=2014 +./xmlchange DATM_YR_START_FILENAME=2005 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 6fe9e9c989..8c3463a936 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=31.496901 ./xmlchange PTS_LAT=-25.019699 ./xmlchange DATM_YR_END=2002 +./xmlchange DATM_YR_START_FILENAME=2000 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index ff19816490..448a26c040 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -2,10 +2,10 @@ ./xmlchange PTS_LON=23.252781 ./xmlchange PTS_LAT=-15.437778 ./xmlchange DATM_YR_END=2008 +./xmlchange DATM_YR_START_FILENAME=2008 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams From ba1de86775efaed74f9dba24f9be52b230bf3263 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 8 Aug 2024 12:17:44 -0600 Subject: [PATCH 44/81] minor typo fix --- tools/site_and_regional/create_PLUMBER2_sites_csv.ncl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl index 2bcf9915ca..b83e3ef3a7 100644 --- a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl +++ b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl @@ -163,7 +163,7 @@ begin fname = "/glade/work/oleson/ctsm_PLUMBERcsv/tools/site_and_regional/PLUMBER2_sites.csv" header = (/"#pftX-cth and pftX-cbh are the site=specific canopy top and bottom heights", \ - "#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.", \ + "#start_year and end_year will be used to define DATM_YR_ALIGN, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.", \ "#RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight.", \ "#ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data.", \ ",Site,Lat,Lon,pft1,pft1-%,pft1-cth,pft1-cbh,pft2,pft2-%,pft2-cth,pft2-cbh,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL"/) From 2b265ca9c874ce4e8c25290078d4f1ff19fb8a7d Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 8 Aug 2024 13:42:18 -0600 Subject: [PATCH 45/81] Update buildnml for accurate restart file time of day --- cime_config/buildnml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 893f0933c7..06a447e443 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -71,6 +71,7 @@ def buildnml(case, caseroot, compname): yr_start = int(yr_start) yr_end = int(yr_end) + clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") comp_atm = case.get_value("COMP_ATM") lnd_grid = case.get_value("LND_GRID") ninst_lnd = case.get_value("NINST_LND") @@ -80,6 +81,7 @@ def buildnml(case, caseroot, compname): run_refcase = case.get_value("RUN_REFCASE") run_refdate = case.get_value("RUN_REFDATE") run_reftod = case.get_value("RUN_REFTOD") + start_tod = case.get_value("START_TOD") glc_nec = case.get_value("GLC_NEC") glc_use_antarctica = case.get_value("GLC_USE_ANTARCTICA") mask = case.get_value("MASK_GRID") @@ -348,13 +350,22 @@ def buildnml(case, caseroot, compname): if run_type == "hybrid" or run_type == "branch": compnames = ["clm4", "clm5", "clm2"] for comp in compnames: - clm_startfile = "%s.%s%s.r.%s-%s.nc" % ( - run_refcase, - comp, - inst_string, - run_refdate, - run_reftod, - ) + if "PLUMBER2" in clm_usrdat_name: + clm_startfile = "%s.%s%s.r.%s-%s.nc" % ( + run_refcase, + comp, + inst_string, + run_refdate, + start_tod, + ) + else: + clm_startfile = "%s.%s%s.r.%s-%s.nc" % ( + run_refcase, + comp, + inst_string, + run_refdate, + run_reftod, + ) if os.path.exists(os.path.join(rundir, clm_startfile)): break else: @@ -372,7 +383,7 @@ def buildnml(case, caseroot, compname): break if not os.path.exists(os.path.join(rundir, clm_startfile)): - logger.warning("WARNING: Could NOT find a start file named" + clm_startfile) + logger.warning("WARNING: Could NOT find a start file named " + clm_startfile) clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile) else: clm_icfile = "" From 5f6d49608409fedb3c22ca1f65076ec175020cf0 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Fri, 16 Aug 2024 16:15:16 -0600 Subject: [PATCH 46/81] update cdeps tag in gitmodules for plumber2 implementation --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4e9f5b51fb..80c1640e72 100644 --- a/.gitmodules +++ b/.gitmodules @@ -92,7 +92,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git [submodule "cdeps"] path = components/cdeps url = https://github.com/ESCOMP/CDEPS.git -fxtag = cdeps1.0.34 +fxtag = cdeps1.0.47 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git From e9b629db2cc57ac52e4ff691b4762968d364e80d Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 16 Aug 2024 16:22:53 -0600 Subject: [PATCH 47/81] Simplify the validation checking for megan specifier as the expressions allowed are much more complex now, this resolves #2709 --- bld/CLMBuildNamelist.pm | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index daf4320c18..e4cc50614c 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -5652,26 +5652,10 @@ sub check_megan_spec { my $megan_spec = $nl->get_value('megan_specifier'); my @megan_spec_list = split( /\s*,\s*/, $megan_spec ); - foreach $megan_spec ( @megan_spec_list ) { - if ( $megan_spec =~ /^['"]+[A-Za-z0-9]+\s*\=\s*([\sA-Za-z0-9+_-]+)["']+$/ ) { - my $megan_list = $1; - my @megan_cmpds = split( /\s*\+\s*/, $megan_list ); - my $var = "megan_cmpds"; - my $warn = 0; - foreach my $megan_cmpd ( @megan_cmpds ) { - if ( ! $definition->is_valid_value( $var, $megan_cmpd, 'noquotes'=>1 ) ) { - $log->warning("megan_compound $megan_cmpd NOT found in list" ); - $warn++; - } - } - if ( $warn > 0 ) { - my @valid_values = $definition->get_valid_values( $var, 'noquotes'=>1 ); - $log->warning("list of megan compounds includes:\n" . - "@valid_values\n" . - "Does your megan_factors_file include more compounds?\n" . - "If NOT your simulation will fail." ); - } - } else { + foreach my $spec ( @megan_spec_list ) { + $megan_spec = remove_leading_and_trailing_quotes($spec); + # Do simple validation of the expressions to just check for valid characters + if ( ! $megan_spec =~ /[\s=A-Za-z0-9_\+\.\*\(\)-]+/ ) { $log->fatal_error("Bad format for megan_specifier = $megan_spec"); } } From 0f5819f240a258558b3b2161d7a89676b8a07a91 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 21 Aug 2024 10:56:59 -0600 Subject: [PATCH 48/81] black and clarified tod reference --- cime_config/buildnml | 50 ++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 06a447e443..cbefd4f155 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -184,7 +184,9 @@ def buildnml(case, caseroot, compname): clm_phys = case.get_value("CLM_PHYSICS_VERSION") config_cache_text = _config_cache_template.format(clm_phys=clm_phys) - config_cache_path = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") + config_cache_path = os.path.join( + caseroot, "Buildconf", compname + "conf", "config_cache.xml" + ) with open(config_cache_path, "w") as config_cache_file: config_cache_file.write(config_cache_text) @@ -291,13 +293,17 @@ def buildnml(case, caseroot, compname): if (yr_start != None) and (yr_end != None): nyr = yr_end - yr_start + 1 if (yr_end <= 0) or (yr_start <= 0): - logger.error("ERROR: Year start and end are both negative and should not be") + logger.error( + "ERROR: Year start and end are both negative and should not be" + ) clm_namelist_opts = "nyr_forcing={} {}".format(nyr, clm_namelist_opts) else: logger.warning( "WARNING: It does not make sense to do a SASU spinup with a prognostic atmosphere model" ) - logger.warning(" as it expects regular atmosphere forcing that is cycled over") + logger.warning( + " as it expects regular atmosphere forcing that is cycled over" + ) infile = os.path.join(ctsmconf, "namelist") @@ -311,7 +317,9 @@ def buildnml(case, caseroot, compname): lndfrac_file = os.path.join(lnd_domain_path, lnd_domain_file) lndfrac_setting = "-lnd_frac " + lndfrac_file - config_cache_file = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") + config_cache_file = os.path.join( + caseroot, "Buildconf", compname + "conf", "config_cache.xml" + ) # ----------------------------------------------------- # Clear out old data @@ -351,21 +359,19 @@ def buildnml(case, caseroot, compname): compnames = ["clm4", "clm5", "clm2"] for comp in compnames: if "PLUMBER2" in clm_usrdat_name: - clm_startfile = "%s.%s%s.r.%s-%s.nc" % ( - run_refcase, - comp, - inst_string, - run_refdate, - start_tod, - ) + # start_tod is supplied for PLUMBER cases + tod = start_tod else: - clm_startfile = "%s.%s%s.r.%s-%s.nc" % ( - run_refcase, - comp, - inst_string, - run_refdate, - run_reftod, - ) + # run_reftod is supplied for other cases + tod = run_reftod + + clm_startfile = "%s.%s%s.r.%s-%s.nc" % ( + run_refcase, + comp, + inst_string, + run_refdate, + tod, + ) if os.path.exists(os.path.join(rundir, clm_startfile)): break else: @@ -383,7 +389,9 @@ def buildnml(case, caseroot, compname): break if not os.path.exists(os.path.join(rundir, clm_startfile)): - logger.warning("WARNING: Could NOT find a start file named " + clm_startfile) + logger.warning( + "WARNING: Could NOT find a start file named " + clm_startfile + ) clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile) else: clm_icfile = "" @@ -394,7 +402,9 @@ def buildnml(case, caseroot, compname): user_nl_file = os.path.join(caseroot, "user_nl_clm" + inst_string) namelist_infile = os.path.join(ctsmconf, "namelist") - create_namelist_infile(case, user_nl_file, namelist_infile, "\n".join(infile_lines)) + create_namelist_infile( + case, user_nl_file, namelist_infile, "\n".join(infile_lines) + ) cmd = os.path.join(lnd_root, "bld", "build-namelist") From b6fc52f6cfdb72c4334b4e035bb9cc0f66774587 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 21 Aug 2024 11:00:53 -0600 Subject: [PATCH 49/81] undo black changes --- cime_config/buildnml | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index cbefd4f155..2c4a320046 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -184,9 +184,7 @@ def buildnml(case, caseroot, compname): clm_phys = case.get_value("CLM_PHYSICS_VERSION") config_cache_text = _config_cache_template.format(clm_phys=clm_phys) - config_cache_path = os.path.join( - caseroot, "Buildconf", compname + "conf", "config_cache.xml" - ) + config_cache_path = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") with open(config_cache_path, "w") as config_cache_file: config_cache_file.write(config_cache_text) @@ -293,17 +291,13 @@ def buildnml(case, caseroot, compname): if (yr_start != None) and (yr_end != None): nyr = yr_end - yr_start + 1 if (yr_end <= 0) or (yr_start <= 0): - logger.error( - "ERROR: Year start and end are both negative and should not be" - ) + logger.error("ERROR: Year start and end are both negative and should not be") clm_namelist_opts = "nyr_forcing={} {}".format(nyr, clm_namelist_opts) else: logger.warning( "WARNING: It does not make sense to do a SASU spinup with a prognostic atmosphere model" ) - logger.warning( - " as it expects regular atmosphere forcing that is cycled over" - ) + logger.warning(" as it expects regular atmosphere forcing that is cycled over") infile = os.path.join(ctsmconf, "namelist") @@ -317,9 +311,7 @@ def buildnml(case, caseroot, compname): lndfrac_file = os.path.join(lnd_domain_path, lnd_domain_file) lndfrac_setting = "-lnd_frac " + lndfrac_file - config_cache_file = os.path.join( - caseroot, "Buildconf", compname + "conf", "config_cache.xml" - ) + config_cache_file = os.path.join(caseroot, "Buildconf", compname + "conf", "config_cache.xml") # ----------------------------------------------------- # Clear out old data @@ -389,9 +381,7 @@ def buildnml(case, caseroot, compname): break if not os.path.exists(os.path.join(rundir, clm_startfile)): - logger.warning( - "WARNING: Could NOT find a start file named " + clm_startfile - ) + logger.warning("WARNING: Could NOT find a start file named " + clm_startfile) clm_icfile = "%s = '%s'" % (startfile_type, clm_startfile) else: clm_icfile = "" @@ -402,9 +392,7 @@ def buildnml(case, caseroot, compname): user_nl_file = os.path.join(caseroot, "user_nl_clm" + inst_string) namelist_infile = os.path.join(ctsmconf, "namelist") - create_namelist_infile( - case, user_nl_file, namelist_infile, "\n".join(infile_lines) - ) + create_namelist_infile(case, user_nl_file, namelist_infile, "\n".join(infile_lines)) cmd = os.path.join(lnd_root, "bld", "build-namelist") From 53a1874b48c82591f45212ba7df5c29254e61a4c Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 21 Aug 2024 12:01:57 -0600 Subject: [PATCH 50/81] CAM_SETS_DRV_FLDS tests don't need to have drv_flds_in settings to be explicit --- bld/unit_testers/build-namelist_test.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index 1b54f29d92..de5a9b0e13 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -454,8 +454,8 @@ sub cat_and_create_namelistinfile { $mode = "-phys $phys CAM_SETS_DRV_FLDS"; &make_config_cache($phys); foreach my $options ( - "--res 1.9x2.5 --mask gx1v7 --bgc sp --no-megan --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam6.0 --infile empty_user_nl_clm", - "--res 1.9x2.5 --mask gx1v7 --bgc sp --no-megan --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm", + "--res 1.9x2.5 --mask gx1v7 --bgc sp --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam6.0 --infile empty_user_nl_clm", + "--res 1.9x2.5 --mask gx1v7 --bgc sp --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm", ) { &make_env_run( 'LND_SETS_DUST_EMIS_DRV_FLDS'=>"FALSE" ); eval{ system( "$bldnml --envxml_dir . $options > $tempfile 2>&1 " ); }; @@ -1286,7 +1286,7 @@ sub cat_and_create_namelistinfile { phys=>"clm5_0", }, "bad_megan_spec" =>{ options=>"-envxml_dir . -bgc bgc -megan", - namelst=>"megan_specifier='ZZTOP=zztop'", + namelst=>"megan_specifier='ZZTOP=zztop%'", phys=>"clm4_5", }, "FUN_wo_flexCN" =>{ options=>"-envxml_dir . -bgc bgc", From 717f957123f1b10dd2676438f7dcb7b95aa31c59 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 21 Aug 2024 12:10:19 -0600 Subject: [PATCH 51/81] Get working with bringing in CAM drv_flds_in Get it working with bringing in the CAM drv_flds_in file. And make it not matter on the --megan --drydep --fire_emis options. Also do dust_emis before the other drv_flds_in namelists, so the CAM namelist is loaded. --- bld/CLMBuildNamelist.pm | 72 ++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index e4cc50614c..1fad577c51 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -1449,7 +1449,7 @@ sub setup_cmdl_vichydro { sub process_namelist_commandline_namelist { # Process the commandline '-namelist' arg. - my ($opts, $definition, $nl, $envxml_ref) = @_; + my ($opts, $definition, $nl, $envxml_ref, %settings) = @_; if (defined $opts->{'namelist'}) { # Parse commandline namelist @@ -1471,7 +1471,7 @@ sub process_namelist_commandline_namelist { } sub process_namelist_infile { - my ($definition, $nl, $envxml_ref, $infile) = @_; + my ($definition, $nl, $envxml_ref, $infile, %settings) = @_; # Make sure a valid file was found if ( -f "$infile" ) { @@ -1493,7 +1493,7 @@ sub process_namelist_infile { # Merge input values into namelist. Previously specified values have higher precedence # and are not overwritten. - $nl->merge_nl($nl_infile_valid); + $nl->merge_nl($nl_infile_valid, %settings); } #------------------------------------------------------------------------------- @@ -1756,6 +1756,12 @@ sub process_namelist_inline_logic { ################################## setup_logic_lightning_streams($opts, $nl_flags, $definition, $defaults, $nl); + ###################################### + # namelist options for dust emissions + ###################################### + setup_logic_dust_emis($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref); + setup_logic_prigent_roughness($opts, $nl_flags, $definition, $defaults, $nl); + ################################# # namelist group: drydep_inparm # ################################# @@ -1766,12 +1772,6 @@ sub process_namelist_inline_logic { ################################# setup_logic_fire_emis($opts, $nl_flags, $definition, $defaults, $nl); - ###################################### - # namelist options for dust emissions - ###################################### - setup_logic_dust_emis($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref); - setup_logic_prigent_roughness($opts, $nl_flags, $definition, $defaults, $nl); - ################################# # namelist group: megan_emis_nl # ################################# @@ -3998,17 +3998,18 @@ sub setup_logic_lightning_streams { sub setup_logic_dry_deposition { my ($opts, $nl_flags, $definition, $defaults, $nl) = @_; + my @list = ( "drydep_list", "dep_data_file"); if ($opts->{'drydep'} ) { - if ( &value_is_true( $nl_flags->{'use_fates'}) && not &value_is_true( $nl_flags->{'use_fates_sp'}) ) { - $log->warning("DryDeposition can NOT be on when FATES is also on unless FATES-SP mode is on.\n" . - " Use the '--no-drydep' option when '-bgc fates' is activated"); - } add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'drydep_list'); add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'dep_data_file'); - } else { - if ( defined($nl->get_value('drydep_list')) ) { - $log->fatal_error("drydep_list defined, but drydep option NOT set"); - } + } + if ( &value_is_true( $nl_flags->{'use_fates'}) && not &value_is_true( $nl_flags->{'use_fates_sp'}) ) { + foreach my $var ( @list ) { + if ( defined($nl->get_value($var)) ) { + $log->warning("DryDeposition $var is being set and can NOT be on when FATES is also on unless FATES-SP mode is on.\n" . + " Use the '--no-drydep' option when '-bgc fates' is activated"); + } + } } } @@ -4017,20 +4018,20 @@ sub setup_logic_dry_deposition { sub setup_logic_fire_emis { my ($opts, $nl_flags, $definition, $defaults, $nl) = @_; + my @list = ( "fire_emis_eleveated", "fire_emis_factors_file", "fire_emis_specifier"); + if ($opts->{'fire_emis'} ) { - if ( &value_is_true( $nl_flags->{'use_fates'} ) ) { - $log->warning("Fire emission can NOT be on when FATES is also on.\n" . - " DON'T use the '-fire_emis' option when '-bgc fates' is activated"); - } add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fire_emis_factors_file'); add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fire_emis_specifier'); - } else { - if ( defined($nl->get_value('fire_emis_elevated')) || - defined($nl->get_value('fire_emis_factors_file')) || - defined($nl->get_value('fire_emis_specifier')) ) { - $log->fatal_error("fire_emission setting defined: fire_emis_elevated, fire_emis_factors_file, or fire_emis_specifier, but fire_emis option NOT set"); - } } + foreach my $var ( @list ) { + if ( defined($nl->get_value($var)) ) { + if ( &value_is_true( $nl_flags->{'use_fates'} ) ) { + $log->warning("Fire emission option $var can NOT be on when FATES is also on.\n" . + " DON'T use the '--fire_emis' option when '--bgc fates' is activated"); + } + } + } } #------------------------------------------------------------------------------- @@ -4094,7 +4095,8 @@ sub setup_logic_dust_emis { } # Now process the CAM drv_flds_in to get the dust settings my $infile = $opts->{'envxml_dir'} . "/Buildconf/camconf/drv_flds_in"; - process_namelist_infile( $definition, $nl, $envxml_ref, $infile ); + $log->verbose_message("Read in the drv_flds_in file generated by CAM's build-namelist"); + process_namelist_infile( $definition, $nl, $envxml_ref, $infile, 'die_on_conflict'=>1 ); } } @@ -4115,17 +4117,15 @@ sub setup_logic_megan { } if ($nl_flags->{'megan'} ) { - if ( &value_is_true( $nl_flags->{'use_fates'} ) ) { - $log->warning("MEGAN can NOT be on when FATES is also on.\n" . - " Use the '-no-megan' option when '-bgc fates' is activated"); - } add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'megan_specifier'); - check_megan_spec( $opts, $nl, $definition ); add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'megan_factors_file'); - } else { - if ( defined($nl->get_value('megan_specifier')) || + } + if ( defined($nl->get_value('megan_specifier')) || defined($nl->get_value('megan_factors_file')) ) { - $log->fatal_error("megan_specifier or megan_factors_file defined, but megan option NOT set"); + check_megan_spec( $opts, $nl, $definition ); + if ( &value_is_true( $nl_flags->{'use_fates'} ) ) { + $log->warning("MEGAN can NOT be on when FATES is also on.\n" . + " Use the '-no-megan' option when '-bgc fates' is activated"); } } } From 45eae6057294a73e8a0b05df725615f6525eaaaf Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:24:04 -0600 Subject: [PATCH 52/81] Update buildnml to minimize duplication --- cime_config/buildnml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 2c4a320046..e9849a9e50 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -226,23 +226,19 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": + if ("NEON" in clm_usrdat_name) or ("PLUMBER2" in clm_usrdat_name) and clm_force_coldstart == "off": + if "NEON" in clm_usrdat_name: + match = "\w\w\w\w\" + if "PLUMBER2" in clm_usrdat_name: + match = "\w\w-\w\w\w\" if ("_transient" in clm_nml_use_case) and ( - re.fullmatch(r"\w\w\w\w\.transient", casename) is None + re.fullmatch(r"{}.transient".format(match), casename) is None or clm_usrdat_name is "NEON.PRISM" ): logger.warning( "WARNING: Do you have appropriate initial conditions for this simulation?" + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case" ) - if "PLUMBER2" in clm_usrdat_name and clm_force_coldstart == "off": - if ("_transient" in clm_nml_use_case) and ( - re.fullmatch(r"\w\w-\w\w\w\.transient", casename) is None - ): - logger.warning( - "WARNING: Do you have appropriate initial conditions for this simulation?" - + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case" - ) if comp_atm != "datm": nomeg = "-no-megan" From 7cf865d9e9f5ebf2a0966c7d2c2a931acf0b9caf Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:26:32 -0600 Subject: [PATCH 53/81] Update match --- cime_config/buildnml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index e9849a9e50..19574b0ba6 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -228,9 +228,9 @@ def buildnml(case, caseroot, compname): # Write warning about initial condition data if ("NEON" in clm_usrdat_name) or ("PLUMBER2" in clm_usrdat_name) and clm_force_coldstart == "off": if "NEON" in clm_usrdat_name: - match = "\w\w\w\w\" + match = '\w\w\w\w\' if "PLUMBER2" in clm_usrdat_name: - match = "\w\w-\w\w\w\" + match = '\w\w-\w\w\w\' if ("_transient" in clm_nml_use_case) and ( re.fullmatch(r"{}.transient".format(match), casename) is None or clm_usrdat_name is "NEON.PRISM" From 82556be443579e6235bda4f39a0009520705e763 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:32:39 -0600 Subject: [PATCH 54/81] Update buildnml for fullmatch failure --- cime_config/buildnml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 19574b0ba6..2525624c0e 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -227,14 +227,19 @@ def buildnml(case, caseroot, compname): clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data if ("NEON" in clm_usrdat_name) or ("PLUMBER2" in clm_usrdat_name) and clm_force_coldstart == "off": + warning_init_conditions = False if "NEON" in clm_usrdat_name: - match = '\w\w\w\w\' + if ("_transient" in clm_nml_use_case) and ( + re.fullmatch(r"\w\w\w\w\.transient", casename) is None + or clm_usrdat_name is "NEON.PRISM" + ): + warning_init_conditions = True if "PLUMBER2" in clm_usrdat_name: - match = '\w\w-\w\w\w\' - if ("_transient" in clm_nml_use_case) and ( - re.fullmatch(r"{}.transient".format(match), casename) is None - or clm_usrdat_name is "NEON.PRISM" - ): + if ("_transient" in clm_nml_use_case) and ( + re.fullmatch(r"\w\w-\w\w\w\.transient", casename) is None + ): + warning_init_conditions = True + if warning_init_conditions == True: logger.warning( "WARNING: Do you have appropriate initial conditions for this simulation?" + " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case" From 07f66fde3e2ff5000f7986b600a98bf3eb8f9908 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:37:43 -0600 Subject: [PATCH 55/81] Update buildnml - attempt at black fix --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 2525624c0e..11ac16cf9a 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -226,7 +226,7 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if ("NEON" in clm_usrdat_name) or ("PLUMBER2" in clm_usrdat_name) and clm_force_coldstart == "off": + if "NEON" in clm_usrdat_name or "PLUMBER2" in clm_usrdat_name and clm_force_coldstart == "off": warning_init_conditions = False if "NEON" in clm_usrdat_name: if ("_transient" in clm_nml_use_case) and ( From d18b369830dc2f5e6f4945d7a765110a91f5c567 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:44:18 -0600 Subject: [PATCH 56/81] Update buildnml based on subset of local black changes --- cime_config/buildnml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 11ac16cf9a..900f36131d 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -226,7 +226,11 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") clmusr = " -clm_usr_name %s " % clm_usrdat_name # Write warning about initial condition data - if "NEON" in clm_usrdat_name or "PLUMBER2" in clm_usrdat_name and clm_force_coldstart == "off": + if ( + "NEON" in clm_usrdat_name + or "PLUMBER2" in clm_usrdat_name + and clm_force_coldstart == "off": + ): warning_init_conditions = False if "NEON" in clm_usrdat_name: if ("_transient" in clm_nml_use_case) and ( From 8b72bb5f27a971880d8e5bf41bb93a08c31f90e7 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:46:50 -0600 Subject: [PATCH 57/81] Update buildnml local black changes remove colon --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 900f36131d..e9b7a610cd 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -229,7 +229,7 @@ def buildnml(case, caseroot, compname): if ( "NEON" in clm_usrdat_name or "PLUMBER2" in clm_usrdat_name - and clm_force_coldstart == "off": + and clm_force_coldstart == "off" ): warning_init_conditions = False if "NEON" in clm_usrdat_name: From 406edd4596fe6bba3d3d5095996fe729d0bccbd3 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 22 Aug 2024 14:39:14 -0600 Subject: [PATCH 58/81] Add some comments about some of this being temporary and point to the issue regarding it --- bld/CLMBuildNamelist.pm | 32 +++++++++++++++++++++----------- cime_config/config_component.xml | 1 + 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index 1fad577c51..52ac4c1d6f 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -1756,25 +1756,29 @@ sub process_namelist_inline_logic { ################################## setup_logic_lightning_streams($opts, $nl_flags, $definition, $defaults, $nl); - ###################################### + ############################################################################################ # namelist options for dust emissions - ###################################### + # NOTE: This MUST be done before other drv_flds_in settings (megan, drydep, fire_emis etc.) + ############################################################################################ setup_logic_dust_emis($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref); setup_logic_prigent_roughness($opts, $nl_flags, $definition, $defaults, $nl); - ################################# - # namelist group: drydep_inparm # - ################################# + ##################################### + # namelist group: drydep_inparm # + # NOTE: After setup_logic_dust_emis # + ##################################### setup_logic_dry_deposition($opts, $nl_flags, $definition, $defaults, $nl); - ################################# - # namelist group: fire_emis_nl # - ################################# + ##################################### + # namelist group: fire_emis_nl # + # NOTE: After setup_logic_dust_emis # + ##################################### setup_logic_fire_emis($opts, $nl_flags, $definition, $defaults, $nl); - ################################# - # namelist group: megan_emis_nl # - ################################# + ##################################### + # namelist group: megan_emis_nl # + # NOTE: After setup_logic_dust_emis # + ##################################### setup_logic_megan($opts, $nl_flags, $definition, $defaults, $nl); ################################## @@ -4041,6 +4045,8 @@ sub setup_logic_dust_emis { my ($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref) = @_; # Only set dust emission settings -- if not connected to CAM + # Longer term plan is to remove this logic and have CTSM just set it and for CAM to use what CLM decides + # See: https://github.com/ESCOMP/CTSM/issues/2713 my $lnd_sets_dust = logical_to_fortran($envxml_ref->{'LND_SETS_DUST_EMIS_DRV_FLDS'}); if ( &value_is_true( $lnd_sets_dust)) { @@ -4094,8 +4100,12 @@ sub setup_logic_dust_emis { } } # Now process the CAM drv_flds_in to get the dust settings + # This requires that the CAM drv_flds_in namelist be created BEFORE CLM + # and that the path below NOT be changed. Hence, there's some fragility here + # to future changes. my $infile = $opts->{'envxml_dir'} . "/Buildconf/camconf/drv_flds_in"; $log->verbose_message("Read in the drv_flds_in file generated by CAM's build-namelist"); + # When merging the CAM namelist in -- die with an error if there's a conflict between CAM and CLM process_namelist_infile( $definition, $nl, $envxml_ref, $infile, 'die_on_conflict'=>1 ); } } diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 3c48e16651..e3f559b08a 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -167,6 +167,7 @@ + logical TRUE,FALSE TRUE From fa7f8f5928609f67cd710149802db30bf886428b Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 22 Aug 2024 15:22:19 -0600 Subject: [PATCH 59/81] Fix bug in setting of init_interp_attributes that should have been for clm6_0_cam6.0, that came about due to XML code duplication --- bld/namelist_files/namelist_defaults_ctsm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 167ded8c62..668ea1e05f 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -1193,12 +1193,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case). -hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. -hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. From 796bd834fb575153d681992cc3641ee0636333bd Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 22 Aug 2024 15:35:14 -0600 Subject: [PATCH 60/81] Get the megan_spec checker working for identifying bad characters in a string --- bld/CLMBuildNamelist.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index 52ac4c1d6f..37eedff6e5 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -5665,7 +5665,7 @@ sub check_megan_spec { foreach my $spec ( @megan_spec_list ) { $megan_spec = remove_leading_and_trailing_quotes($spec); # Do simple validation of the expressions to just check for valid characters - if ( ! $megan_spec =~ /[\s=A-Za-z0-9_\+\.\*\(\)-]+/ ) { + if ( $megan_spec !~ /^([\s=A-Za-z0-9_\+\.\*\(\)-]+)$/ ) { $log->fatal_error("Bad format for megan_specifier = $megan_spec"); } } From b2d7edf8f629406b01ec0044ea8655de9d670da5 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 22 Aug 2024 17:14:44 -0600 Subject: [PATCH 61/81] Duplicate a bunch of XML so that the namelist unit tester works for all the tests --- bld/namelist_files/namelist_defaults_ctsm.xml | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 668ea1e05f..394f72a62e 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -1059,12 +1059,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. -hgrid=ne0np4.ARCTIC.ne30x4 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. -hgrid=ne0np4.ARCTICGRIS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. @@ -1144,6 +1144,26 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. +hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + + +hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + + +hgrid=ne0np4.ARCTIC.ne30x4 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + + +hgrid=ne0np4.ARCTICGRIS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + + hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. @@ -1213,6 +1233,26 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=ne0np4.ARCTICGRIS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. +hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + + +hgrid=1.9x2.5 maxpft=17 mask=gx1v7 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + + +hgrid=ne0np4.ARCTIC.ne30x4 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + + +hgrid=ne0np4.ARCTICGRIS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. + + Date: Thu, 22 Aug 2024 17:15:17 -0600 Subject: [PATCH 62/81] Change fatal error to warning for megan_specifier --- bld/CLMBuildNamelist.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index 37eedff6e5..94f6bf7e38 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -5666,7 +5666,7 @@ sub check_megan_spec { $megan_spec = remove_leading_and_trailing_quotes($spec); # Do simple validation of the expressions to just check for valid characters if ( $megan_spec !~ /^([\s=A-Za-z0-9_\+\.\*\(\)-]+)$/ ) { - $log->fatal_error("Bad format for megan_specifier = $megan_spec"); + $log->warning("Bad format for megan_specifier = $megan_spec"); } } } From a5a15ed19bd7517e3abfd9994353c3f42bd49e8d Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 22 Aug 2024 17:17:11 -0600 Subject: [PATCH 63/81] Correct test number and remove fail tests that are now allowed to happen because you can set drv_flds_in settings without using the CLM_BLDNML_OPTS options for it --- bld/unit_testers/build-namelist_test.pl | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index de5a9b0e13..8b2827b069 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -163,10 +163,10 @@ sub cat_and_create_namelistinfile { # # Figure out number of tests that will run # -my $ntests = 3339; +my $ntests = 3349; if ( defined($opts{'compare'}) ) { - $ntests += 1999; + $ntests += 2007; } plan( tests=>$ntests ); @@ -1093,14 +1093,6 @@ sub cat_and_create_namelistinfile { namelst=>"use_hydrstress=.true.", phys=>"clm5_0", }, - "specWOfireemis" =>{ options=>"-envxml_dir . -no-fire_emis", - namelst=>"fire_emis_specifier='bc_a1 = BC'", - phys=>"clm5_0", - }, - "elevWOfireemis" =>{ options=>"-envxml_dir . -no-fire_emis", - namelst=>"fire_emis_elevated=.false.", - phys=>"clm5_0", - }, "noanthro_w_crop" =>{ options=>"-envxml_dir . -res 0.9x1.25 -bgc bgc -crop -use_case 1850_noanthro_control", namelst=>"", phys=>"clm5_0", From 00d288b297be5806e7abdbb16f42ba37f4e0d54c Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Wed, 21 Aug 2024 15:24:09 -0600 Subject: [PATCH 64/81] Change CTSM machine default for Derecho to develop queue w/ 32 cpus. --- python/ctsm/machine_defaults.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/ctsm/machine_defaults.py b/python/ctsm/machine_defaults.py index a17f063a4b..f07a313dcb 100644 --- a/python/ctsm/machine_defaults.py +++ b/python/ctsm/machine_defaults.py @@ -77,13 +77,13 @@ create_test_queue=CREATE_TEST_QUEUE_UNSPECIFIED, job_launcher_defaults={ JOB_LAUNCHER_QSUB: QsubDefaults( - queue="main", + queue="develop", walltime="03:50:00", extra_args="", # The following assumes a single node, with a single mpi proc; we may want # to add more flexibility in the future, making the node / proc counts # individually selectable - required_args="-l select=1:ncpus=128:mpiprocs=1 -V -r n -k oed", + required_args="-l select=1:ncpus=32:mpiprocs=1 -V -r n -k oed", ) }, ), From add600b14f1a7ddaea6b163a501bb61fb824905f Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Fri, 23 Aug 2024 09:43:49 -0600 Subject: [PATCH 65/81] Change to 16 to match GMAKE_J. --- python/ctsm/machine_defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/ctsm/machine_defaults.py b/python/ctsm/machine_defaults.py index f07a313dcb..16742da47e 100644 --- a/python/ctsm/machine_defaults.py +++ b/python/ctsm/machine_defaults.py @@ -83,7 +83,7 @@ # The following assumes a single node, with a single mpi proc; we may want # to add more flexibility in the future, making the node / proc counts # individually selectable - required_args="-l select=1:ncpus=32:mpiprocs=1 -V -r n -k oed", + required_args="-l select=1:ncpus=16:mpiprocs=1 -V -r n -k oed", ) }, ), From b35320a2c452dcb99e82a183bffda126c1206eb1 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 8 Dec 2021 13:54:28 -0700 Subject: [PATCH 66/81] Also include the mizuRoute expected fails list --- parse_cime.cs.status | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/parse_cime.cs.status b/parse_cime.cs.status index 08bb1bfc86..269878d0bd 100755 --- a/parse_cime.cs.status +++ b/parse_cime.cs.status @@ -302,6 +302,7 @@ sub print_categories { if ( ! -f $expectedfailfile ) { $expectedfailfile = "$scrdir/cime_config/testdefs/ExpectedTestFails.xml"; } + my @failfiles = ( $expectedfailfile, "$scrdir/components/mizuRoute/cime_config/testdefs/ExpectedTestFails.xml" ); my @passes; my @fails; my @pendings; @@ -341,8 +342,10 @@ sub print_categories { print( "================================================================================\n" ); foreach my $key ( @passes ) { my $expect = ""; - `grep $key $expectedfailfile > /dev/null`; - if ( $? == 0 ) { $expect = "FAILED PREVIOUSLY"; } + foreach my $expectedfailfile ( @failfiles ) { + `grep $key $expectedfailfile > /dev/null`; + if ( $? == 0 ) { $expect = "FAILED PREVIOUSLY"; } + } print( "$key\t\t\t$expect\n" ); } } @@ -368,8 +371,10 @@ sub print_categories { print( "================================================================================\n" ); foreach my $key ( @pendings ) { my $expect = ""; - `grep $key $expectedfailfile > /dev/null`; - if ( $? == 0 ) { $expect = "EXPECTED"; } + foreach my $expectedfailfile ( @failfiles ) { + `grep $key $expectedfailfile > /dev/null`; + if ( $? == 0 ) { $expect = "EXPECTED"; } + } print( "$key\t\t$expect\n" ); } } @@ -379,8 +384,10 @@ sub print_categories { print( "================================================================================\n" ); foreach my $key ( @fails ) { my $expect = ""; - `grep $key $expectedfailfile > /dev/null`; - if ( $? == 0 ) { $expect = "EXPECTED"; } + foreach my $expectedfailfile ( @failfiles ) { + `grep $key $expectedfailfile > /dev/null`; + if ( $? == 0 ) { $expect = "EXPECTED"; } + } print( "$key\t\t$expect\n" ); } } From 463e85d8f624fb8f8b64592f4a6824b80683bdd9 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 19 Jan 2022 22:45:47 -0700 Subject: [PATCH 67/81] Add bit from SLIM that includes what parts FAIL when reporting summary of fails --- parse_cime.cs.status | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/parse_cime.cs.status b/parse_cime.cs.status index 269878d0bd..8ef8ef2bf6 100755 --- a/parse_cime.cs.status +++ b/parse_cime.cs.status @@ -384,11 +384,12 @@ sub print_categories { print( "================================================================================\n" ); foreach my $key ( @fails ) { my $expect = ""; + my $fails = $csstatus{$key}{'FAIL'}; foreach my $expectedfailfile ( @failfiles ) { `grep $key $expectedfailfile > /dev/null`; if ( $? == 0 ) { $expect = "EXPECTED"; } } - print( "$key\t\t$expect\n" ); + print( "$key\t$fails\t$expect\n" ); } } } From 8fbfcc009c26459e5c76c03309d1d58c678583c8 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 25 Jan 2022 14:32:09 -0700 Subject: [PATCH 68/81] Add an extra tab --- parse_cime.cs.status | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parse_cime.cs.status b/parse_cime.cs.status index 8ef8ef2bf6..fb2d8e4283 100755 --- a/parse_cime.cs.status +++ b/parse_cime.cs.status @@ -389,7 +389,7 @@ sub print_categories { `grep $key $expectedfailfile > /dev/null`; if ( $? == 0 ) { $expect = "EXPECTED"; } } - print( "$key\t$fails\t$expect\n" ); + print( "$key\t$fails\t\t$expect\n" ); } } } From 0d1a867beb91d1e8a1aacd57a3165dd297c33a1b Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 26 Aug 2024 16:06:00 -0600 Subject: [PATCH 69/81] Make a little subroutine to check the expected fails --- parse_cime.cs.status | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/parse_cime.cs.status b/parse_cime.cs.status index fb2d8e4283..885b53c6c4 100755 --- a/parse_cime.cs.status +++ b/parse_cime.cs.status @@ -290,7 +290,15 @@ sub print_sumperline { } } - +sub expectedFails { + my ($key, $message, @failfiles) = @_; + my $expect = ""; + foreach my $expectedfailfile ( @failfiles ) { + `grep $key $expectedfailfile > /dev/null`; + if ( $? == 0 ) { $expect = $message; } + } + return( $expect ); +} sub print_categories { # Seperate tests into categories @@ -341,11 +349,7 @@ sub print_categories { print( "These tests passed\n" ); print( "================================================================================\n" ); foreach my $key ( @passes ) { - my $expect = ""; - foreach my $expectedfailfile ( @failfiles ) { - `grep $key $expectedfailfile > /dev/null`; - if ( $? == 0 ) { $expect = "FAILED PREVIOUSLY"; } - } + my $expect = &expectedFails( $key, "FAILED PREVIOUSLY", @failfiles ); print( "$key\t\t\t$expect\n" ); } } @@ -370,26 +374,19 @@ sub print_categories { print( "These tests are pending (some tests may fail in the pending state)\n" ); print( "================================================================================\n" ); foreach my $key ( @pendings ) { - my $expect = ""; - foreach my $expectedfailfile ( @failfiles ) { - `grep $key $expectedfailfile > /dev/null`; - if ( $? == 0 ) { $expect = "EXPECTED"; } - } + my $expect = &expectedFails( $key, "EXPECTED", @failfiles ); print( "$key\t\t$expect\n" ); } } if ( $#fails >= 0 ) { print( "================================================================================\n" ); print( "These tests failed\n" ); + print( "Test (what Failed) If expected\n" ); print( "================================================================================\n" ); foreach my $key ( @fails ) { - my $expect = ""; + my $expect = &expectedFails( $key, "EXPECTED", @failfiles ); my $fails = $csstatus{$key}{'FAIL'}; - foreach my $expectedfailfile ( @failfiles ) { - `grep $key $expectedfailfile > /dev/null`; - if ( $? == 0 ) { $expect = "EXPECTED"; } - } - print( "$key\t$fails\t\t$expect\n" ); + print( "$key\t($fails)\t\t$expect\n" ); } } } From cd6a94b3512bf9d4def7b7db1af85e77fb3e1690 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 26 Aug 2024 17:03:09 -0600 Subject: [PATCH 70/81] Report on the expected fails for tests --- parse_cime.cs.status | 46 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/parse_cime.cs.status b/parse_cime.cs.status index 885b53c6c4..264ba0708f 100755 --- a/parse_cime.cs.status +++ b/parse_cime.cs.status @@ -204,7 +204,11 @@ sub run_csstatus { do { $newline = shift(@lines); if ( $newline =~ /FAIL[ ]+$test ([^ ]+)/ ) { - $fails .= " $1"; + if ( $fails eq "" ) { + $fails = $1; + } else { + $fails .= " $1"; + } chomp( $fails ); if ( $1 eq "BASELINE" ) { if ( $newline =~ /ERROR BFAIL baseline directory/ ) { @@ -291,13 +295,31 @@ sub print_sumperline { } sub expectedFails { + # Query expected fail file for the input testname key my ($key, $message, @failfiles) = @_; my $expect = ""; + my $expectedfails = ""; foreach my $expectedfailfile ( @failfiles ) { - `grep $key $expectedfailfile > /dev/null`; - if ( $? == 0 ) { $expect = $message; } + my $fh = IO::File->new($expectedfailfile, '<') or die "ERROR:: failure opening $expectedfailfile\n"; + while( my $line = <$fh> ) { + if ( $line =~ /$key/ ) { + $expect = $message; + # Read past the testname until the test end is found... + # Keep track of all of the expected fails and return it at the end + while( my $testline = <$fh> ) { + if ( $testline =~ /phase\s+name\s*=\s*\"([a-zA-Z0-9_]+)/ ) { + if ( $expectedfails eq "" ) { + $expectedfails = $1; + } else { + $expectedfails = "$expectedfails $1"; + } + } + if ( $testline =~ /\<\/test\>/ ) { last; } + } + } + } } - return( $expect ); + return( $expect, $expectedfails ); } sub print_categories { @@ -349,7 +371,9 @@ sub print_categories { print( "These tests passed\n" ); print( "================================================================================\n" ); foreach my $key ( @passes ) { - my $expect = &expectedFails( $key, "FAILED PREVIOUSLY", @failfiles ); + my ($expect, $expectFails) = &expectedFails( $key, "FAILED PREVIOUSLY", @failfiles ); + if ( $expect ne "" ) { $expect = "$expect ($expectFails)"; } + if ($expectFails =~ /BASELINE/ ) { $expect = ""; } print( "$key\t\t\t$expect\n" ); } } @@ -358,7 +382,9 @@ sub print_categories { print( "These tests compare different to the baseline\n" ); print( "================================================================================\n" ); foreach my $key ( @compares_diff ) { - print( "$key\n" ); + my ($expect, $expectFails) = &expectedFails( $key, "EXPECTED POSSIBILITY", @failfiles ); + if ($expectFails !~ /BASELINE/ ) { $expect = ""; } + print( "$key\t\t$expect\n" ); } } if ( $#compares_diff_nobase >= 0 ) { @@ -374,17 +400,19 @@ sub print_categories { print( "These tests are pending (some tests may fail in the pending state)\n" ); print( "================================================================================\n" ); foreach my $key ( @pendings ) { - my $expect = &expectedFails( $key, "EXPECTED", @failfiles ); + my ($expect, $expectFails) = &expectedFails( $key, "EXPECTED", @failfiles ); + if ( $expect ne "" ) { $expect = "$expect ($expectFails)"; } print( "$key\t\t$expect\n" ); } } if ( $#fails >= 0 ) { print( "================================================================================\n" ); print( "These tests failed\n" ); - print( "Test (what Failed) If expected\n" ); + print( "Test (what Failed) EXPECTED (what expected to fail)\n" ); print( "================================================================================\n" ); foreach my $key ( @fails ) { - my $expect = &expectedFails( $key, "EXPECTED", @failfiles ); + my ($expect, $expectFails) = &expectedFails( $key, "EXPECTED", @failfiles ); + if ( $expect ne "" ) { $expect = "$expect ($expectFails)"; } my $fails = $csstatus{$key}{'FAIL'}; print( "$key\t($fails)\t\t$expect\n" ); } From c5aeec66333b37050bd426c678ac36f9ec3f0c62 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 26 Aug 2024 21:43:31 -0600 Subject: [PATCH 71/81] Add some more notes about -drydep, -fire_emis, -no-megan options options that they add testing namelists, but you can always add the fields to user_nl_clm even when they are turned off --- bld/CLMBuildNamelist.pm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index 94f6bf7e38..15d51ccfcb 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -159,16 +159,20 @@ OPTIONS This turns on the namelist variable: use_crop -csmdata "dir" Root directory of CESM input data. Can also be set by using the CSMDATA environment variable. - -drydep Produce a drydep_inparm namelist that will go into the + -drydep Produce a drydep_inparm namelist for testing that will go into the "drv_flds_in" file for the driver to pass dry-deposition to the atm. + This populates the namelist with valid drydep settings for testing. Default: -no-drydep + Note: Can always add drydep fields to user_nl_clm even with --no-drydep (Note: buildnml copies the file for use by the driver) -dynamic_vegetation Toggle for dynamic vegetation model. (default is off) (can ONLY be turned on when BGC type is 'bgc') This turns on the namelist variable: use_cndv (Deprecated, this will be removed) - -fire_emis Produce a fire_emis_nl namelist that will go into the + -fire_emis Produce a fire_emis_nl namelist for testing that will go into the "drv_flds_in" file for the driver to pass fire emissions to the atm. + This populates the namelist with valid fire-emiss settings for testing. + Note: Can always add fire_emis fields to user_nl_clm even with --no-fire_emis (Note: buildnml copies the file for use by the driver) -glc_nec Glacier number of elevation classes [0 | 3 | 5 | 10 | 36] (default is 0) (standard option with land-ice model is 10) @@ -204,9 +208,11 @@ OPTIONS -namelist "namelist" Specify namelist settings directly on the commandline by supplying a string containing FORTRAN namelist syntax, e.g., -namelist "&clm_inparm dt=1800 /" - -no-megan DO NOT PRODUCE a megan_emis_nl namelist that will go into the + -no-megan DO NOT PRODUCE a megan_emis_nl namelist for testing that will go into the "drv_flds_in" file for the driver to pass VOCs to the atm. MEGAN (Model of Emissions of Gases and Aerosols from Nature) + This removes setting default values for testing MEGAN fields + Note: Can always add megan fields to user_nl_clm even with --no-megan (Note: buildnml copies the file for use by the driver) -[no-]note Add note to output namelist [do NOT add note] about the arguments to build-namelist. From 46a09d91c08cf39a5352f9b2e78e7622f3376503 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 26 Aug 2024 22:10:27 -0600 Subject: [PATCH 72/81] Update some of the documentation around the -drydep, -fire_emis and --no-megan build-namelist options --- bld/namelist_files/namelist_defaults_drydep.xml | 6 +++--- bld/namelist_files/namelist_defaults_fire_emis.xml | 4 ++-- bld/namelist_files/namelist_definition_drv_flds.xml | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_drydep.xml b/bld/namelist_files/namelist_defaults_drydep.xml index 08bb5adaef..fb73ab6646 100644 --- a/bld/namelist_files/namelist_defaults_drydep.xml +++ b/bld/namelist_files/namelist_defaults_drydep.xml @@ -5,7 +5,7 @@ - + 'O3','NO2','HNO3','NO','HO2NO2','CH3OOH','CH2O','CO','H2O2','CH3COOOH','PAN','MPAN','C2H5OOH','ONIT','POOH','C3H7OOH','ROOH','CH3COCHO','CH3COCH3','Pb','ONITR','MACROOH','XOOH','ISOPOOH','CH3OH','C2H5OH','CH3CHO','GLYALD','HYAC','HYDRALD','ALKOOH','MEKOOH','TOLOOH','TERPOOH','CH3COOH','CB1','CB2','OC1','OC2','SOA','SO2','SO4','NH3','NH4NO3' @@ -21,7 +21,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). atm/cam/chem/trop_mozart/dvel/dep_data_c201019.nc - + 'ISOP = isoprene', 'C10H16 = pinene_a + carene_3 + thujene_a', 'CH3OH = methanol', 'C2H5OH = ethanol', 'CH2O = formaldehyde', 'CH3CHO = acetaldehyde', 'CH3COOH = acetic_acid', 'CH3COCH3 = acetone' diff --git a/bld/namelist_files/namelist_defaults_fire_emis.xml b/bld/namelist_files/namelist_defaults_fire_emis.xml index b7536ba66b..54e67424d5 100644 --- a/bld/namelist_files/namelist_defaults_fire_emis.xml +++ b/bld/namelist_files/namelist_defaults_fire_emis.xml @@ -5,7 +5,7 @@ - + 'bc_a1 = BC','pom_a1 = 1.4*OC','SO2 = SO2' diff --git a/bld/namelist_files/namelist_definition_drv_flds.xml b/bld/namelist_files/namelist_definition_drv_flds.xml index 9bb1a3e3b0..f440a9a678 100644 --- a/bld/namelist_files/namelist_definition_drv_flds.xml +++ b/bld/namelist_files/namelist_definition_drv_flds.xml @@ -35,10 +35,14 @@ group="megan_emis_nl" valid_values="" > MEGAN specifier. This is in the form of: Chem-compound = megan_compound(s) - where megan_compound(s) can be the sum of megan compounds with a "+" between them. + where megan_compound(s) can be an equation with megan compounds added or subtracted together with multiplication In each equation, the item to the left of the equal sign is a CAM chemistry compound, the items to the right are compounds known to the MEGAN model (single or combinations). + Long lines for equations can be split into multiple specifiers For example: megan_specifier = 'ISOP = isoprene', 'C10H16 = pinene_a + carene_3 + thujene_a' + or... megan_specifier = 'SOAE = 0.5954*isoprene + 5.1004*(carene_3 + pinene_a + thujene_a + bornene +', + ' terpineol_4 + terpineol_a + terpinyl_ACT_a + myrtenal + sabinene + pinene_b + camphene +', + and etcetera... Date: Mon, 26 Aug 2024 23:11:11 -0600 Subject: [PATCH 73/81] Update documentation around the drv_flds_in testing namelists and command line options to build-namelist -drydep, -fire_emis and -no-megan --- .../customizing-the-clm-configuration.rst | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/doc/source/users_guide/setting-up-and-running-a-case/customizing-the-clm-configuration.rst b/doc/source/users_guide/setting-up-and-running-a-case/customizing-the-clm-configuration.rst index e76a9cc6f0..a1efac897e 100644 --- a/doc/source/users_guide/setting-up-and-running-a-case/customizing-the-clm-configuration.rst +++ b/doc/source/users_guide/setting-up-and-running-a-case/customizing-the-clm-configuration.rst @@ -140,10 +140,17 @@ CLM_BLDNML_OPTS Can also be set by using the CSMDATA environment variable. -d "directory" Directory where output namelist file will be written Default: current working directory. - -drydep Produce a drydep_inparm namelist that will go into the + -drydep Produce a drydep_inparm namelist for testing that will go into the "drv_flds_in" file for the driver to pass dry-deposition to the atm. + This populates the namelist with valid drydep settings for testing. Default: -no-drydep - (Note: buildnml.csh copies the file for use by the driver) + Note: Can always add drydep fields to user_nl_clm even with --no-drydep + (Note: buildnml copies the file for use by the driver) + -fire_emis Produce a fire_emis_nl namelist for testing that will go into the + "drv_flds_in" file for the driver to pass fire emissions to the atm. + This populates the namelist with valid fire-emiss settings for testing. + Note: Can always add fire_emis fields to user_nl_clm even with --no-fire_emis + (Note: buildnml copies the file for use by the driver) -glc_grid "grid" Glacier model grid and resolution when glacier model, Only used if glc_nec > 0 for determining fglcmask Default: gland5UM @@ -185,10 +192,12 @@ CLM_BLDNML_OPTS -namelist "namelist" Specify namelist settings directly on the commandline by supplying a string containing FORTRAN namelist syntax, e.g., -namelist "&clm_inparm dt=1800 /" - -no-megan DO NOT PRODUCE a megan_emis_nl namelist that will go into the + -no-megan DO NOT PRODUCE a megan_emis_nl namelist for testing that will go into the "drv_flds_in" file for the driver to pass VOCs to the atm. MEGAN (Model of Emissions of Gases and Aerosols from Nature) - (Note: buildnml.csh copies the file for use by the driver) + This removes setting default values for testing MEGAN fields + Note: Can always add megan fields to user_nl_clm even with --no-megan + (Note: buildnml copies the file for use by the driver) -[no-]note Add note to output namelist [do NOT add note] about the arguments to build-namelist. -rcp "value" Representative concentration pathway (rcp) to use for @@ -258,6 +267,8 @@ The **$CTSMROOT/cime_config/buildnml** script already sets the resolution and ma #. -drydep +#. -fire_emis + #. -ignore_ic_date #. -ignore_ic_year @@ -291,7 +302,7 @@ To see a list of valid variables that you could set do this: .. note:: Using a 20th-Century transient compset or the ``20thC_transient`` use-case using ``CLM_NML_USE_CASE`` would set this as well, but would also use dynamic nitrogen and aerosol deposition files, so using ``-clm_demand`` would be a way to get *just* dynamic vegetation types and NOT the other files as well. -"-drydep" adds the dry-deposition namelist to the driver. This is a driver namelist, but adding the option here has CLM **build-namelist** create the ``drv_flds_in`` file that the driver will copy over and use. Invoking this option does have an impact on performance even for I compsets and will slow the model down. It's also only useful when running with an active atmosphere model that makes use of this information. +"-drydep" adds a dry-deposition namelist for testing to the driver. This is a driver namelist, but adding the option here has CLM **build-namelist** create the ``drv_flds_in`` file that the driver will copy over and use. Invoking this option does have an impact on performance even for I compsets and will slow the model down. It's also only useful when running with an active atmosphere model that makes use of this information. "-ignore_ic_date" ignores the Initial Conditions (IC) date completely for finding initial condition files to startup from. Without this option or the "-ignore_ic_year" option below, the date of the file comes into play. @@ -299,7 +310,7 @@ To see a list of valid variables that you could set do this: When "-irrig on" is used **build-namelist** will try to find surface datasets that have the irrigation model enabled (when running with Sattellitte Phenology). When running with the prognostic crop model on, "-irrig on" will turn irrigate crops on, while "-irrig off" will manage all crop areas as rain-fed without irrigation. -"no-megan" means do NOT add the MEGAN model Biogenic Volatile Organic Compounds (BVOC) namelist to the driver. This namelist is created by default, so normally this WILL be done. This is a driver namelist, so unless "no-megan" is specified the CLM **build-namelist** will create the ``drv_flds_in`` file that the driver will copy over and use (if you are running with CAM and CAM produces this file as well, it's file will have precedence). +"no-megan" means do NOT add a MEGAN model Biogenic Volatile Organic Compounds (BVOC) testing namelist to the driver. This namelist is created by default, so normally this WILL be done. This is a driver namelist, so unless "no-megan" is specified the CLM **build-namelist** will create the ``drv_flds_in`` file that the driver will copy over and use (if you are running with CAM and CAM produces this file as well, it's file will have precedence). "-note" adds a note to the bottom of the namelist file, that gives the details of how **build-namelist** was called, giving the specific command-line options given to it. @@ -363,18 +374,20 @@ Example: user_nl_clm namelist file ! 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 use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting + ! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting + ! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting + ! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting + ! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting ! Set co2_ppmv with CCSM_CO2_PPMV option - ! Set dtime with L_NCPL option ! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options ! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases ! (includes $inst_string for multi-ensemble cases) - ! Set glc_grid with GLC_GRID option - ! Set glc_smb with GLC_SMB option - ! Set maxpatch_glc with GLC_NEC option + ! or with CLM_FORCE_COLDSTART to do a cold start + ! or set it with an explicit filename here. + ! Set maxpatch_glc with GLC_NEC option + ! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable !---------------------------------------------------------------------------------- hist_fincl2 = 'TG','TBOT','FIRE','FIRA','FLDS','FSDS', 'FSR','FSA','FGEV','FSH','FGR','TSOI', From f1ad74d8ee0e081f1c1448a9c3b19a8710cdbed0 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 27 Aug 2024 10:43:20 -0600 Subject: [PATCH 74/81] Update change log for new b4b-dev tag, make standard for python testing to be run on derecho --- doc/.ChangeLog_template | 2 +- doc/ChangeLog | 86 +++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 3 files changed, 88 insertions(+), 1 deletion(-) diff --git a/doc/.ChangeLog_template b/doc/.ChangeLog_template index 60a7f49288..c95ea482e3 100644 --- a/doc/.ChangeLog_template +++ b/doc/.ChangeLog_template @@ -98,7 +98,7 @@ infrastructure should be run when appropriate, as described below. python testing (if python code has changed; see instructions in python/README.md; document testing done): - (any machine) - + derecho - [If python code has changed and you are NOT running aux_clm (e.g., because the only changes are in python code) then also run the clm_pymods test suite; this is a small subset of aux_clm that runs the system diff --git a/doc/ChangeLog b/doc/ChangeLog index 96c0d6735b..c77ec2204f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,90 @@ =============================================================== +Tag name: ctsm5.2.027 +Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) +Date: Tue 27 Aug 2024 10:39:39 AM MDT +One-line Summary: Merge b4b-dev + +Purpose and description of changes +---------------------------------- + + +Significant changes to scientifically-supported configurations +-------------------------------------------------------------- + +Does this tag change answers significantly for any of the following physics configurations? +(Details of any changes will be given in the "Answer changes" section below.) + + [Put an [X] in the box for any configuration with significant answer changes.] + +[ ] clm6_0 + +[ ] clm5_1 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed +---------- + +List of CTSM issues fixed (include CTSM Issue # and description) [one per line]: + +Notes of particular relevance for users +--------------------------------------- + +Caveats for users (e.g., need to interpolate initial conditions): + +Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): + +Changes made to namelist defaults (e.g., changed parameter values): + +Changes to the datasets (e.g., parameter, surface or initial files): + +Changes to documentation: + +Notes of particular relevance for developers: +--------------------------------------------- + +Caveats for developers (e.g., code that is duplicated that requires double maintenance): + +Changes to tests or testing: + + +Testing summary: regular +---------------- + [PASS means all tests PASS; OK means tests PASS other than expected fails.] + + build-namelist tests (if CLMBuildNamelist.pm has changed): + + derecho - PASS + + python testing (if python code has changed; see instructions in python/README.md; document testing done): + + derecho - PASS + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- OK + izumi ------- OK + +Answer changes +-------------- + +Changes answers relative to baseline: No bit-for-bit + +Other details +------------- + +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): cdeps + +Pull Requests that document the changes (include PR ids): +(https://github.com/ESCOMP/ctsm/pull) + +=============================================================== +=============================================================== Tag name: ctsm5.2.026 Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310) Date: Fri 23 Aug 2024 05:17:56 PM MDT diff --git a/doc/ChangeSum b/doc/ChangeSum index 6071278954..468cbe0077 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.2.027 erik 08/27/2024 Merge b4b-dev ctsm5.2.026 slevis 08/23/2024 Turn on excess ice, explicit AC, Leung_2023 for clm6 ctsm5.2.025 samrabin 08/23/2024 Minor fixes to li2024 fire methods ctsm5.2.024 samrabin 08/22/2024 Improve li2024 fire methods From ddec5536cd6ae2e040315f550c71d464302ae09f Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 27 Aug 2024 13:13:51 -0600 Subject: [PATCH 75/81] Update change files --- doc/ChangeLog | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index c77ec2204f..e481310125 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -7,6 +7,17 @@ One-line Summary: Merge b4b-dev Purpose and description of changes ---------------------------------- +Bring b4b-dev branch to main CTSM development. + +- PLUMBER2 for ctsm5.2 datasets +- Last bit of PPE changes for namelist and parameter file settings +- Update run_sys_tests on Derecho for compiler jobs to run using 16 tasks +- Bring in a fix for dust emissions for coupling with CAM + +Update cs.status parsing script to make expected BASELINE fails more obvious + +Fix some issues with finding IC files for certain lnd_tuning_modes: all for cam7, + clm5_0_cam6.0, and clm6_0_cam6.0 Significant changes to scientifically-supported configurations -------------------------------------------------------------- @@ -31,27 +42,52 @@ Bugs fixed ---------- List of CTSM issues fixed (include CTSM Issue # and description) [one per line]: + Fixes #2687 -- Error in Prigent streams setting when coupled to CAM + Fixes #2709 -- Problem in megan_specifier checking in namelist due to update in CMEPS + Fixes #2712 -- Allow user to change drydep, fire_emiss, megan namelists in user_nl_clm + even when those CLM_BLDNML_OPTS are off + Fixes #2567 -- PPE prep work + Fixes #1652 -- c3psn is wrong for some PFT's not currently used + Fixes #2484 -- update PLUMBER2 user-mods to ctsm5.2 surface datasets Notes of particular relevance for users --------------------------------------- Caveats for users (e.g., need to interpolate initial conditions): + atm_provides_lightning can be set in drv_flds_in now, but doesn't do anything Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): + Changed behavior for CLM_BLDNML_OPTS command line options: -drydep, -megan, and -fire_emis + Turning them on now only adds test namelists to use, you can add custom settings for them + in user_nl_clm with or without them on -Changes made to namelist defaults (e.g., changed parameter values): + atm_provides_lightning and atm_ozone_frequency can be set in user_nl_clm for drv_flds_in + The first is not active, and the second you should probably have CAM set -Changes to the datasets (e.g., parameter, surface or initial files): + New XML variable: PLUMBER2SITE to set the site name for PLUMBER2 cases -Changes to documentation: +Changes made to namelist defaults (e.g., changed parameter values): PLUMBER2 datasets + + Using PLUMBER2 user-mods now gives you ctsm5.2 surface datasets + +Changes to the datasets (e.g., parameter, surface or initial files): parameter files + New parameter file with c3psn corrected and ndays_on changed to PFT + new parameters: crit_onset_gdd_sf, zbedrock, zbedrock_sf + +Changes to documentation: Yes regarding build-namelist command line options listed above Notes of particular relevance for developers: --------------------------------------------- Caveats for developers (e.g., code that is duplicated that requires double maintenance): + When LND_SETS_DUST_EMIS_DRV_FLD==FALSE (so coupled to CAM) -- The CAM $CASEDIR/Buildconf/camconf/drv_flds_in namelist is read in to get the CAM drv_flds_in settings. For this to work correctly + the drydep, and fire-emiss subroutines need to be after the dust_emis subroutine which reads in + the CAM drv_flds_in. + See plan to phase out LND_SETS_DUST_EMIS_DRV_FLD here: + https://github.com/ESCOMP/CTSM/issues/2713 Changes to tests or testing: - + Updated parameter files for some specific test mods Testing summary: regular ---------------- @@ -59,7 +95,7 @@ Testing summary: regular build-namelist tests (if CLMBuildNamelist.pm has changed): - derecho - PASS + derecho - PASS (1005 different because of new parameter files) python testing (if python code has changed; see instructions in python/README.md; document testing done): @@ -79,9 +115,11 @@ Other details ------------- List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): cdeps + cdeps to cdeps1.0.47 Pull Requests that document the changes (include PR ids): (https://github.com/ESCOMP/ctsm/pull) + https://github.com/ESCOMP/CTSM/pull/2731 -- merge b4b-dev =============================================================== =============================================================== From bae5c8c9553d4ea9cb986a98187720478f524281 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 27 Aug 2024 22:10:38 -0600 Subject: [PATCH 76/81] Update ChangeLog with more details --- doc/ChangeLog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index e481310125..cf160fce82 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: ctsm5.2.027 Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) -Date: Tue 27 Aug 2024 10:39:39 AM MDT +Date: Tue 27 Aug 2024 10:09:39 PM MDT One-line Summary: Merge b4b-dev Purpose and description of changes @@ -56,6 +56,13 @@ Notes of particular relevance for users Caveats for users (e.g., need to interpolate initial conditions): atm_provides_lightning can be set in drv_flds_in now, but doesn't do anything + When LND_SETS_DUST_EMIS_DRV_FLD==FALSE and you are coupled to CAM + and there is a conflict between CAM and CTSM settings, a message like this happens: + + Using clm5_0_cam6.0 for lnd_tuning_mode +Read in the drv_flds_in file generated by CAM's build-namelist +Build::Namelist::_merge_nl:ERROR: A variable was already set, so we are terminating on the conflict variable name is =dep_data_file + Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): Changed behavior for CLM_BLDNML_OPTS command line options: -drydep, -megan, and -fire_emis Turning them on now only adds test namelists to use, you can add custom settings for them From 9fd631ac427e4db07244eb88d583bd3ecc0c1821 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 28 Aug 2024 14:33:19 -0600 Subject: [PATCH 77/81] Update CDEPS to hopefully resolve the CDEPS build issue I ran into --- .gitmodules | 2 +- components/cdeps | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 80c1640e72..d16396da55 100644 --- a/.gitmodules +++ b/.gitmodules @@ -92,7 +92,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git [submodule "cdeps"] path = components/cdeps url = https://github.com/ESCOMP/CDEPS.git -fxtag = cdeps1.0.47 +fxtag = cdeps1.0.48 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git diff --git a/components/cdeps b/components/cdeps index 7476950699..7b0b3a8272 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 7476950699909813d1938a34bd8d71bf5bfbf1e9 +Subproject commit 7b0b3a827241c53d296ec877cb1f59966bf5e5bf From 4bc95457011259127b8c509c48c221c6ff19a8f4 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 28 Aug 2024 16:30:12 -0600 Subject: [PATCH 78/81] Increase wall limit for test --- cime_config/testdefs/testlist_clm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index de9cd0b1be..d1c3171c98 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -152,7 +152,7 @@ - + From 41c3e092b53a749f2002d7b50b0e0965ca19a19e Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 28 Aug 2024 17:08:08 -0600 Subject: [PATCH 79/81] Remove tests that now pass from expected fails --- cime_config/testdefs/ExpectedTestFails.xml | 23 +--------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index d1e0a1a8b8..6f4d9ac2dc 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -8,7 +8,7 @@ - ... + ... @@ -52,13 +52,6 @@ - - - FAIL - #2444 - - - FAIL @@ -113,20 +106,6 @@ - - - FAIL - #2373 - - - - - - FAIL - #2373 - - - FAIL From 729b688b262bd305d83a1e6ebee8bd29a2d76646 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 28 Aug 2024 18:52:21 -0600 Subject: [PATCH 80/81] Another test no longer failing, and fix accidental addition --- cime_config/testdefs/ExpectedTestFails.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 6f4d9ac2dc..e18b15a26e 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -8,7 +8,7 @@ - ... + ... @@ -165,17 +165,6 @@ - - - FAIL - #2373 - - - FAIL - FATES#701 - - - FAIL From 4a62d0dc1edda9ee96fada2b4280f05f8d4c2b9b Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 28 Aug 2024 21:14:20 -0600 Subject: [PATCH 81/81] Update date for change files --- doc/ChangeLog | 2 +- doc/ChangeSum | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index cf160fce82..3499c7d720 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: ctsm5.2.027 Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) -Date: Tue 27 Aug 2024 10:09:39 PM MDT +Date: Wed 28 Aug 2024 09:13:22 PM MDT One-line Summary: Merge b4b-dev Purpose and description of changes diff --git a/doc/ChangeSum b/doc/ChangeSum index 468cbe0077..fdf253760f 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.2.027 erik 08/27/2024 Merge b4b-dev + ctsm5.2.027 erik 08/28/2024 Merge b4b-dev ctsm5.2.026 slevis 08/23/2024 Turn on excess ice, explicit AC, Leung_2023 for clm6 ctsm5.2.025 samrabin 08/23/2024 Minor fixes to li2024 fire methods ctsm5.2.024 samrabin 08/22/2024 Improve li2024 fire methods