Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cam6_4_023: SCAM-SE feature addition plus bugfixes and some refactoring. #958

Merged
merged 36 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
872b60e
build script mods to allow se builds
jtruesdal May 3, 2023
3006e9c
se scam update
jtruesdal Sep 20, 2023
55ab657
bfb mods
jtruesdal Sep 24, 2023
da514d3
update to cam_development (cam6_3_128)
jtruesdal Sep 25, 2023
fd265ed
se scm updates to cmeps cdeps externals
jtruesdal Sep 29, 2023
f202756
scam updates
jtruesdal Nov 26, 2023
1e56c28
update to cam6_3_136 need to update externals yet
jtruesdal Nov 26, 2023
e4f97ea
external updates for scam_dev 6_3_136
jtruesdal Nov 26, 2023
64aa11e
missed cice external update for scam
jtruesdal Nov 26, 2023
b6ee97c
scam se update
jtruesdal Nov 26, 2023
5a9159a
scam se updates
jtruesdal Jan 3, 2024
b4ed83a
scam clean and updates for derecho
jtruesdal Jan 10, 2024
b567e51
bug fix for iopTimeIdx when iop step size is smaller than model timestep
jtruesdal Jan 21, 2024
e7d33d7
PR updates for Cheryl and Jim
jtruesdal Jan 22, 2024
aac8cf6
new default initialization using config_compset and config_component,…
jtruesdal Feb 20, 2024
6e9b777
check for error with mpi_bcast calls
jtruesdal Feb 26, 2024
91af07d
PR requested updates
jtruesdal Mar 5, 2024
53300de
compile catch/fix for se_single_column_mod
jtruesdal Mar 5, 2024
36e8f4b
shorten a few long lines >132
jtruesdal Mar 5, 2024
8851ffd
bugfix for new minloc replacement for loop with exit
jtruesdal Mar 6, 2024
5f7a485
update ice external tag
jtruesdal Mar 7, 2024
bcd2ea5
dont need these cdep mods
jtruesdal Mar 13, 2024
2e344b3
PR updates for Jesse
jtruesdal Apr 19, 2024
0407135
PR updates
jtruesdal Apr 19, 2024
551612d
PR updates
jtruesdal Apr 19, 2024
6f988cd
PR updates
jtruesdal May 15, 2024
bfc7658
PR update for testing
jtruesdal Jun 25, 2024
66b6a24
merge up to cam6_4_006
jtruesdal Jul 8, 2024
6244ced
remove bfb line for testing
jtruesdal Jul 8, 2024
a972f69
merge up to cam6_4_018
jtruesdal Aug 5, 2024
dcc636d
PR updates: comments,typo, and replace hard coded length with shr_kin…
jtruesdal Aug 6, 2024
e004f55
Merge scam_dev_exp up to cam6_4_022
jtruesdal Aug 20, 2024
54a0ba9
update cice and cdeps for regression failures,Changelog for PR,scam t…
jtruesdal Aug 22, 2024
b88c67e
need scam_mandatory to set COLDSTART until CLM scam mods tagged
jtruesdal Aug 23, 2024
40f6c5c
update mpace regression test and ChangeLog
jtruesdal Aug 25, 2024
c50362c
update ChangeLog, pull hvcoord addition
jtruesdal Aug 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Externals.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccs_config]
tag = ccs_config_cesm0.0.82
branch = ccs_config_cesm_scamdev
protocol = git
repo_url = https://github.com/ESMCI/ccs_config_cesm
repo_url = https://github.com/jtruesdal/ccs_config_cesm
local_path = ccs_config
required = True

Expand All @@ -13,24 +13,24 @@ local_path = components/cice5
required = True

[cice6]
tag = cesm_cice6_4_1_10
tag = cesm_cice6_4_1_10_scamdev
protocol = git
repo_url = https://github.com/ESCOMP/CESM_CICE
repo_url = https://github.com/jtruesdal/CESM_CICE
local_path = components/cice
externals = Externals.cfg
required = True

[cmeps]
tag = cmeps0.14.43
branch = cmeps0.14.43_scamdev
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
repo_url = https://github.com/jtruesdal/CMEPS.git
local_path = components/cmeps
required = True

[cdeps]
tag = cdeps1.0.24
branch = cdeps1.0.24_scamdev
cacraigucar marked this conversation as resolved.
Show resolved Hide resolved
protocol = git
repo_url = https://github.com/ESCOMP/CDEPS.git
repo_url = https://github.com/jtruesdal/CDEPS.git
local_path = components/cdeps
externals = Externals_CDEPS.cfg
required = True
Expand All @@ -45,7 +45,7 @@ required = True
[share]
tag = share1.0.17
protocol = git
repo_url = https://github.com/ESCOMP/CESM_share
repo_url = https://github.com/jtruesdal/CESM_share

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change to a fork if you otherwise have no mods here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'll double check this and get rid of it. Thanks.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tag name should be share1.0.17_scamdev. I had a few mods for shr_scam_mod that turned up in testing for this PR. If you can help with the mods for getting rid of MCT I'm happy to include them, test and create the PR to CESM_share. In the meantime I'll fix the tag reference above.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jedwards4b forgot to 'at' you on the previous question. Repeating here:

Tag name should be share1.0.17_scamdev. I had a few mods for shr_scam_mod that turned up in testing for this PR. If you can help with the mods for getting rid of MCT I'm happy to include them, test and create the PR to CESM_share. In the meantime I'll fix the tag reference above.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I haven't looked into it yet, I'll try to do it tomorrow.

local_path = share
required = True

Expand Down Expand Up @@ -79,9 +79,9 @@ externals = Externals_CISM.cfg
required = True

[clm]
tag = ctsm5.1.dev142
tag = ctsm5.1.dev142_scamdev
protocol = git
repo_url = https://github.com/ESCOMP/CTSM
repo_url = https://github.com/jtruesdal/ctsm
local_path = components/clm
externals = Externals_CLM.cfg
required = True
Expand Down
2 changes: 1 addition & 1 deletion bld/build-namelist
Original file line number Diff line number Diff line change
Expand Up @@ -2435,7 +2435,7 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam
}

# MEGAN emissions
if (($chem eq 'trop_mam4' or $chem eq 'waccm_sc_mam4' or $chem eq 'ghg_mam4') and !$aqua_mode and !$scam){
if (($chem eq 'trop_mam4' or $chem eq 'waccm_sc_mam4' or $chem eq 'ghg_mam4') and !$aqua_mode){
my $val = "'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 +',"
Expand Down
10 changes: 5 additions & 5 deletions bld/configure
Original file line number Diff line number Diff line change
Expand Up @@ -1190,8 +1190,8 @@ if (defined $opts{'scam'}) {
}
my $scam = $cfg_ref->get('scam') ? "ON" : "OFF";

# The only dycore supported in SCAM mode is Eulerian
if ($scam eq 'ON' and $dyn_pkg ne 'eul') {
# The only dycores supported in SCAM mode are Eulerian and Spectral Elements
if ($scam eq 'ON' and !($dyn_pkg eq 'eul' or $dyn_pkg eq 'se')) {
die <<"EOF";
** ERROR: SCAM mode only works with Eulerian dycore.
** Requested dycore is: $dyn_pkg
Expand All @@ -1207,10 +1207,10 @@ if (defined $opts{'camiop'}) {
}
my $camiop = $cfg_ref->get('camiop') ? "ON" : "OFF";

# The only dycore supported in CAMIOP mode is Eulerian
if ($camiop eq 'ON' and $dyn_pkg ne 'eul') {
# The only dycores supported in SCAM mode are Eulerian and Spectral Elements
if ($camiop eq 'ON' and !($dyn_pkg eq 'eul' or $dyn_pkg eq 'se')) {
die <<"EOF";
** ERROR: CAMIOP mode only works with Eulerian dycore.
** ERROR: CAMIOP mode only works with the Eulerian or Spectral Element dycores.
** Requested dycore is: $dyn_pkg
EOF
}
Expand Down
17 changes: 12 additions & 5 deletions bld/namelist_files/namelist_defaults_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,9 @@
<bnd_topo hgrid="ne60np4" npg="2">atm/cam/topo/se/ne60pg2_nc3000_Co030_Fi001_PF_nullRR_Nsw021_20171014.nc</bnd_topo>
<bnd_topo hgrid="ne120np4" npg="2">atm/cam/topo/se/ne120pg2_nc3000_Co015_Fi001_PF_nullRR_Nsw010_20171012.nc</bnd_topo>
<bnd_topo hgrid="ne240np4" npg="2">atm/cam/topo/se/ne240pg2_nc3000_Co008_Fi001_PF_nullRR_Nsw005_20171014.nc</bnd_topo>

<bnd_topo hgrid="ne3np4" >atm/cam/topo/se/ne3np4_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230717.nc</bnd_topo>
cacraigucar marked this conversation as resolved.
Show resolved Hide resolved
<bnd_topo hgrid="ne3np4" npg="3">atm/cam/topo/se/ne3pg3_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230209.nc</bnd_topo>
<bnd_topo hgrid="ne4np4" >atm/cam/topo/USGS-gtopo30_ne4np4_16x.c20160612.nc</bnd_topo>
cacraigucar marked this conversation as resolved.
Show resolved Hide resolved
<bnd_topo hgrid="ne5np4" npg="3">atm/cam/topo/se/ne5pg3_nc3000_Co360_Fi001_MulG_PF_nullRR_Nsw064_20170516.nc</bnd_topo>
<bnd_topo hgrid="ne16np4" npg="3">atm/cam/topo/se/ne16pg3_nc3000_Co120_Fi001_PF_nullRR_Nsw084_20171012.nc</bnd_topo>
<bnd_topo hgrid="ne30np4" npg="3">atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_20230105.nc</bnd_topo>
Expand Down Expand Up @@ -1895,7 +1896,9 @@
<gas_wetdep_method phys="spcam_m2005" >OFF</gas_wetdep_method>

<!-- Dry Dep surface data file needed by prognostic MAM on unstructured grid only. -->
<drydep_srf_file hgrid="ne3np4" npg="3" >atm/cam/chem/trop_mam/atmsrf_ne3np4.pg3_c221214.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne3np4" >atm/cam/chem/trop_mam/atmsrf_ne3np4_230718.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne3np4" npg="3" >atm/cam/chem/trop_mam/atmsrf_ne3np4.pg3_221214.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne4np4" >atm/cam/chem/trop_mam/atmsrf_ne4np4_from_0.23x0.31_181018.nc</drydep_srf_file>
cacraigucar marked this conversation as resolved.
Show resolved Hide resolved
<drydep_srf_file hgrid="ne5np4" >atm/cam/chem/trop_mam/atmsrf_ne5np4_110920.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne5np4" npg="3">atm/cam/chem/trop_mam/atmsrf_ne5pg3_201105.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne16np4" >atm/cam/chem/trop_mam/atmsrf_ne16np4_110920.nc</drydep_srf_file>
Expand Down Expand Up @@ -2857,12 +2860,16 @@


<!-- default namelist for SCAM mode -->
<ncdata hgrid="64x128" nlev="30" scam="1" >atm/cam/inic/gaus/cami_0000-09-01_64x128_L30_c031210.nc</ncdata>
<iopfile dyn="eul" scam="1" >atm/cam/scam/iop/ARM97_4scam.nc</iopfile>
<ncdata dyn="eul" hgrid="64x128" nlev="30" scam="1" >atm/cam/inic/gaus/cami_0000-09-01_64x128_L30_c031210.nc</ncdata>
<iopfile scam="1" >atm/cam/scam/iop/ARM97_4scam.nc</iopfile>
<mfilt scam="1" > 1500 </mfilt>
<nhtfrq scam="1" > 9 </nhtfrq>
<scm_use_obs_uv scam="1" > .true. </scm_use_obs_uv>
<scm_zadv_q scam="1" > slt </scm_zadv_q>
<scale_dry_air_mass scam="1" > 0.0D0 </scale_dry_air_mass>
<scm_zadv_q dyn="eul" scam="1" > slt </scm_zadv_q>
<!-- default namelist for SE SCAM mode -->
<ncdata dyn="se1" hgrid="ne3np4" scam="1" >atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-06-01-00000.nc</ncdata>
cacraigucar marked this conversation as resolved.
Show resolved Hide resolved
<ncdata dyn="se" hgrid="ne3np4" scam="1" >allsame</ncdata>

<!-- Eulerian spectral dycore parameters -->

Expand Down
6 changes: 6 additions & 0 deletions bld/namelist_files/namelist_definition.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5812,6 +5812,12 @@ Use the SCAM-IOP specified observed water vapor at each time step instead of for
Default: FALSE
</entry>

<entry id="scm_use_3dfrc" type="logical" category="scam"
group="scam_nl" valid_values="">
Use the SCAM-IOP 3d forcing if true, use combination of dycore vertical advection and iop horiz advection if false
Default:
nusbaume marked this conversation as resolved.
Show resolved Hide resolved
</entry>

<entry id="scm_force_latlon" type="logical" category="scam"
group="scam_nl" valid_values="">
Force scam to use the lat lon fields specified in the scam namelist not what is closest to IOP avail lat lon
Expand Down
2 changes: 1 addition & 1 deletion cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<value compset="CAM60%CVBSX">-chem trop_strat_mam5_vbsext</value>
<value compset="CAM60%CCTS2">-chem trop_strat_mam5_ts2</value>
<value compset="_CAM50%CLB">-clubb_sgs</value>
<value compset="_(CAM40|CAM50|CAM60).*%SCAM">-dyn eul -scam</value>
<value compset="_(CAM40|CAM50|CAM60).*%SCAM">-scam</value>
<value compset="CAM%SPCAMS">-rad camrt -chem none -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_sam1mom </value>
<value compset="CAM%SPCAMCLBS">-rad camrt -chem none -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_sam1mom -spcam_clubb_sgs </value>
<value compset="CAM%SPCAMM">-rad rrtmg -chem trop_mam3 -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_m2005 </value>
Expand Down
15 changes: 12 additions & 3 deletions cime_config/usermods_dirs/scam_arm95/shell_commands
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# setup SCAM lon and lat for this iop
# setup SCAM lon and lat for this iop
# this should correspond to the forcing IOP coordinates
./xmlchange PTS_LON=262.5
./xmlchange PTS_LAT=36.6
Expand All @@ -8,8 +8,17 @@
# but you may simulate any within the IOP start and end times.
./xmlchange RUN_STARTDATE=1995-07-18
./xmlchange START_TOD=19800
./xmlchange STOP_OPTION=nsteps
./xmlchange STOP_N=1259
./xmlchange STOP_OPTION=nhours
./xmlchange STOP_N=418

if [ `./xmlquery --value CAM_DYCORE` == 'se' ]; then
ncdata='"$DIN_LOC_ROOT/atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-07-01-00000.nc"'
else
ncdata='"$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-07-01-00000.nc"'
fi
cat >> user_nl_cam << eof
ncdata=$ncdata
eof

# usermods_dir/scam_mandatory will be included for all single column
# runs by default. This usermods directory contains mandatory settings
Expand Down
3 changes: 1 addition & 2 deletions cime_config/usermods_dirs/scam_arm95/user_nl_cam
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
ncdata="$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-07-01-00000.nc"
iopfile="$DIN_LOC_ROOT/atm/cam/scam/iop/ARM95_4scam.nc"
mfilt=1500
nhtfrq=1
co2vmr=368.9e-6
scm_use_obs_uv = .true.
scm_relaxation = .true.
scm_relax_fincl = 'T', 'bc_a1', 'bc_a4', 'dst_a1', 'dst_a2', 'dst_a3', 'ncl_a1', 'ncl_a2',
scm_relax_fincl = 'T','bc_a1', 'bc_a4', 'dst_a1', 'dst_a2', 'dst_a3', 'ncl_a1', 'ncl_a2',
'ncl_a3', 'num_a1', 'num_a2', 'num_a3',
'num_a4', 'pom_a1', 'pom_a4', 'so4_a1', 'so4_a2', 'so4_a3', 'soa_a1', 'soa_a2'
scm_relax_bot_p = 105000.
Expand Down
13 changes: 11 additions & 2 deletions cime_config/usermods_dirs/scam_arm97/shell_commands
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@
# but you may simulate any within the IOP start and end times.
./xmlchange RUN_STARTDATE=1997-06-18
./xmlchange START_TOD=84585
./xmlchange STOP_OPTION=nsteps
./xmlchange STOP_N=2088
./xmlchange STOP_OPTION=nhours
./xmlchange STOP_N=695

if [ `./xmlquery --value CAM_DYCORE` == 'se' ]; then
ncdata='"$DIN_LOC_ROOT/atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-06-01-00000.nc"'
else
ncdata='"$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-06-01-00000.nc"'
fi
cat >> user_nl_cam << EOF
ncdata=$ncdata
EOF

# usermods_dir/scam_mandatory will be included for all single column
# runs by default. This usermods directory contains mandatory settings
Expand Down
1 change: 0 additions & 1 deletion cime_config/usermods_dirs/scam_arm97/user_nl_cam
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
iopfile="$DIN_LOC_ROOT/atm/cam/scam/iop/ARM97_4scam.nc"
ncdata="$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-06-01-00000.nc"
mfilt=2088
nhtfrq=1
co2vmr=368.9e-6
Expand Down
13 changes: 11 additions & 2 deletions cime_config/usermods_dirs/scam_atex/shell_commands
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@
# but you may simulate any within the IOP start and end times.
./xmlchange RUN_STARTDATE=1969-02-15
./xmlchange START_TOD=0
./xmlchange STOP_OPTION=ndays
./xmlchange STOP_N=2
./xmlchange STOP_OPTION=nhours
./xmlchange STOP_N=47

if [ `./xmlquery --value CAM_DYCORE` == 'se' ]; then
ncdata='"$DIN_LOC_ROOT/atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-02-01-00000.nc"'
else
ncdata='"$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-02-01-00000.nc""'
fi
cat >> user_nl_cam << eof
ncdata=$ncdata
eof

# usermods_dir/scam_mandatory will be included for all single column
# runs by default. This usermods directory contains mandatory settings
Expand Down
1 change: 0 additions & 1 deletion cime_config/usermods_dirs/scam_atex/user_nl_cam
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
iopfile="$DIN_LOC_ROOT/atm/cam/scam/iop/ATEX_48hr_4scam.nc"
ncdata="$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-02-01-00000.nc"
mfilt=2088
nhtfrq=1
scm_use_obs_uv = .true.
Expand Down
13 changes: 11 additions & 2 deletions cime_config/usermods_dirs/scam_bomex/shell_commands
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@
# but you may simulate any within the IOP start and end times.
./xmlchange RUN_STARTDATE=1969-06-25
./xmlchange START_TOD=0
./xmlchange STOP_OPTION=ndays
./xmlchange STOP_N=5
./xmlchange STOP_OPTION=nhours
./xmlchange STOP_N=119

if [ `./xmlquery --value CAM_DYCORE` == 'se' ]; then
ncdata='"$DIN_LOC_ROOT/atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-06-01-00000.nc"'
else
ncdata='"$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-06-01-00000.nc"'
fi
cat >> user_nl_cam << eof
ncdata=$ncdata
eof

# usermods_dir/scam_mandatory will be included for all single column
# runs by default. This usermods directory contains mandatory settings
Expand Down
1 change: 0 additions & 1 deletion cime_config/usermods_dirs/scam_bomex/user_nl_cam
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
iopfile="$DIN_LOC_ROOT/atm/cam/scam/iop/BOMEX_5day_4scam.nc"
ncdata="$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-06-01-00000.nc"
mfilt=2088
nhtfrq=1
scm_use_obs_uv = .true.
Expand Down
13 changes: 11 additions & 2 deletions cime_config/usermods_dirs/scam_cgilsS11/shell_commands
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@
# but you may simulate any within the IOP start and end times.
./xmlchange RUN_STARTDATE=1997-07-15
./xmlchange START_TOD=0
./xmlchange STOP_OPTION=ndays
./xmlchange STOP_N=30
./xmlchange STOP_OPTION=nhours
./xmlchange STOP_N=719

if [ `./xmlquery --value CAM_DYCORE` == 'se' ]; then
ncdata='"$DIN_LOC_ROOT/atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-07-01-00000.nc"'
else
ncdata='"$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-07-01-00000.nc"'
fi
cat >> user_nl_cam << eof
ncdata=$ncdata
eof

# usermods_dir/scam_mandatory will be included for all single column
# runs by default. This usermods directory contains mandatory settings
Expand Down
1 change: 0 additions & 1 deletion cime_config/usermods_dirs/scam_cgilsS11/user_nl_cam
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
iopfile="$DIN_LOC_ROOT/atm/cam/scam/iop/S11_CTL_MixedLayerInit_reduced.nc"
ncdata="$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-07-01-00000.nc"
mfilt=2088
nhtfrq=1
scm_use_obs_uv = .true.
Expand Down
13 changes: 11 additions & 2 deletions cime_config/usermods_dirs/scam_cgilsS12/shell_commands
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@
# but you may simulate any within the IOP start and end times.
./xmlchange RUN_STARTDATE=1997-07-15
./xmlchange START_TOD=0
./xmlchange STOP_OPTION=ndays
./xmlchange STOP_N=30
./xmlchange STOP_OPTION=nhours
./xmlchange STOP_N=719

if [ `./xmlquery --value CAM_DYCORE` == 'se' ]; then
ncdata='"$DIN_LOC_ROOT/atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-07-01-00000.nc"'
else
ncdata='"$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-07-01-00000.nc"'
fi
cat >> user_nl_cam << eof
ncdata=$ncdata
eof

# usermods_dir/scam_mandatory will be included for all single column
# runs by default. This usermods directory contains mandatory settings
Expand Down
1 change: 0 additions & 1 deletion cime_config/usermods_dirs/scam_cgilsS12/user_nl_cam
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
iopfile="$DIN_LOC_ROOT/atm/cam/scam/iop/S12_CTL_MixedLayerInit_reduced.nc"
ncdata="$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-07-01-00000.nc"
mfilt=2088
nhtfrq=1
scm_use_obs_uv = .true.
Expand Down
13 changes: 11 additions & 2 deletions cime_config/usermods_dirs/scam_cgilsS6/shell_commands
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@
# but you may simulate any within the IOP start and end times.
./xmlchange RUN_STARTDATE=1997-07-15
./xmlchange START_TOD=0
./xmlchange STOP_OPTION=ndays
./xmlchange STOP_N=30
./xmlchange STOP_OPTION=nhours
./xmlchange STOP_N=719

if [ `./xmlquery --value CAM_DYCORE` == 'se' ]; then
ncdata='"$DIN_LOC_ROOT/atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-07-01-00000.nc"'
else
ncdata='"$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-07-01-00000.nc"'
fi
cat >> user_nl_cam << eof
ncdata=$ncdata
eof

# usermods_dir/scam_mandatory will be included for all single column
# runs by default. This usermods directory contains mandatory settings
Expand Down
1 change: 0 additions & 1 deletion cime_config/usermods_dirs/scam_cgilsS6/user_nl_cam
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
iopfile="$DIN_LOC_ROOT/atm/cam/scam/iop/S6_CTL_reduced.nc"
ncdata="$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-07-01-00000.nc"
mfilt=2088
nhtfrq=1
scm_use_obs_uv = .true.
Expand Down
13 changes: 11 additions & 2 deletions cime_config/usermods_dirs/scam_dycomsRF01/shell_commands
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@
# but you may simulate any within the IOP start and end times.
./xmlchange RUN_STARTDATE=1999-07-11
./xmlchange START_TOD=0
./xmlchange STOP_OPTION=nsteps
./xmlchange STOP_N=144
./xmlchange STOP_OPTION=nhours
./xmlchange STOP_N=47

if [ `./xmlquery --value CAM_DYCORE` == 'se' ]; then
ncdata='"$DIN_LOC_ROOT/atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-07-01-00000.nc"'
else
ncdata='"$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-07-01-00000.nc"'
fi
cat >> user_nl_cam << eof
ncdata=$ncdata
eof

# usermods_dir/scam_mandatory will be included for all single column
# runs by default. This usermods directory contains mandatory settings
Expand Down
1 change: 0 additions & 1 deletion cime_config/usermods_dirs/scam_dycomsRF01/user_nl_cam
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
iopfile="$DIN_LOC_ROOT/atm/cam/scam/iop/DYCOMSrf01_4day_4scam.nc"
ncdata="$DIN_LOC_ROOT/atm/cam/scam/iop/CESM2.F2000climo.IOP_SITES.cam.i.0003-07-01-00000.nc"
mfilt=2088
nhtfrq=1
scm_use_obs_uv = .true.
Expand Down
Loading