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.

Sign up for GitHub

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

Add RRM CONUS case configuration updates to reduce new user edits #168

Merged
merged 7 commits into from
Apr 14, 2015
Merged

Add RRM CONUS case configuration updates to reduce new user edits #168

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90759a5
Adding mesh_file and zmconv_tau to build.namelist
eroesler Mar 30, 2015
dbe9e70
Adding namelist defaults for CONUS VarRes grid
eroesler Mar 30, 2015
6c760aa
Changes to XML files for easier use of RRM case
eroesler Mar 30, 2015
2c9a362
Changed zmconv_tau from 3000 to 3600
eroesler Apr 2, 2015
8b75d7f
Removing tuning paramters in namelist files
eroesler Apr 6, 2015
db516bf
Fixing typo in namelist_defaults_cam.xml
eroesler Apr 6, 2015
d71e80f
Remove automatic appending of FY to job submission account on redsky …
jgfouca Apr 9, 2015
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
3 changes: 2 additions & 1 deletion models/atm/cam/bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2569,6 +2569,7 @@ add_default($nl, 'cldfrc_icecrit');
add_default($nl, 'zmconv_c0_lnd');
add_default($nl, 'zmconv_c0_ocn');
add_default($nl, 'zmconv_ke');
add_default($nl, 'zmconv_tau');

# moist convection rainwater coefficients
add_default($nl, 'hkconv_cmftau');
Expand Down Expand Up @@ -3001,7 +3002,7 @@ if ($cfg->get('dyn') =~ /se/) {
integration nu nu_div nu_p nu_q nu_top se_phys_tscale
interpolate_analysis interp_nlat interp_nlon vert_remap_q_alg
interp_type interp_gridtype se_limiter_option qsplit rsplit tstep_type
hypervis_scaling );
hypervis_scaling mesh_file);

foreach my $var (@vars) {
add_default($nl, $var);
Expand Down
7 changes: 6 additions & 1 deletion models/atm/cam/bld/namelist_files/namelist_defaults_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,7 @@
<soil_erod_file hgrid="64x128" >atm/cam/dst/dst_64x128_c090203.nc</soil_erod_file>
<soil_erod_file hgrid="128x256" >atm/cam/dst/dst_128x256_c090203.nc</soil_erod_file>


<!-- Turbulent Mountain Stress -->
<do_tms > .false. </do_tms>
<do_tms hgrid="48x96" > .true. </do_tms>
Expand Down Expand Up @@ -808,6 +809,7 @@
<dust_emis_fact dyn="se" phys="cam5" >0.55D0</dust_emis_fact>
<dust_emis_fact dyn="fv" phys="cam5" clubb_sgs="1" >0.13D0</dust_emis_fact>


<!-- in-cloud scav for cloud-borne aerosol tuning factor -->
<sol_facti_cloud_borne >1.0D0</sol_facti_cloud_borne>
<sol_facti_cloud_borne clubb_sgs="1" >0.6D0</sol_facti_cloud_borne>
Expand Down Expand Up @@ -872,6 +874,7 @@
<cldfrc_rhminl hgrid="48x96" phys="cam4" > 0.880D0 </cldfrc_rhminl>
<cldfrc_rhminl dyn="se" phys="cam4" > 0.910D0 </cldfrc_rhminl>


<cldfrc_rhminl_adj_land > 0.100D0 </cldfrc_rhminl_adj_land>
<cldfrc_rhminl_adj_land carma="cirrus" > 0.000D0 </cldfrc_rhminl_adj_land>

Expand Down Expand Up @@ -902,7 +905,6 @@
<cldfrc_dp1 phys="cam5" > 0.10D0 </cldfrc_dp1>
<cldfrc_dp1 dyn="fv" phys="cam4" > 0.10D0 </cldfrc_dp1>
<cldfrc_dp1 dyn="se" phys="cam4" > 0.10D0 </cldfrc_dp1>

<cldfrc_dp2 > 500.0D0 </cldfrc_dp2>
<cldfrc_dp2 phys="cam5" > 500.0D0 </cldfrc_dp2>

Expand Down Expand Up @@ -1010,6 +1012,8 @@
<zmconv_c0_ocn hgrid="256x512" phys="cam4" > 0.0040D0 </zmconv_c0_ocn>
<zmconv_c0_ocn hgrid="512x1024" phys="cam4" > 0.0040D0 </zmconv_c0_ocn>

<zmconv_tau > 3600</zmconv_tau>

<zmconv_ke > 3.0E-6 </zmconv_ke>
<zmconv_ke dyn="fv" > 1.0E-6 </zmconv_ke>
<zmconv_ke dyn="se" > 1.0E-6 </zmconv_ke>
Expand Down Expand Up @@ -1084,6 +1088,7 @@
<statefreq> 480 </statefreq>
<integration> "explicit" </integration>

<mesh_file>/dev/null</mesh_file>
<mesh_file hgrid="ne0np4_arm_x8v3_lowcon" >atm/cam/inic/homme/arm_x8v3_lowcon.g</mesh_file>
<mesh_file hgrid="ne0np4_conus_x4v1_lowcon" >atm/cam/inic/homme/conusx4v1.g</mesh_file>
<mesh_file hgrid="ne0np4_svalbard_x8v1_lowcon" >atm/cam/inic/homme/svalbardx8v1.g</mesh_file>
Expand Down
4 changes: 3 additions & 1 deletion models/atm/cam/src/dynamics/se/share/namelist_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,9 @@ subroutine readnl(par)
write (*,*) "namelist_mod: mesh_file:",mesh_file, &
" and ne:",ne," are both sepcified in the input file."
write (*,*) "Specify one or the other, but not both."
call abortmp("Do not specify ne if using a mesh file input.")
! Don't abort if not refined (i.e., ne /= 0).
! mesh_file is set to /dev/null in namelist_defaults_cam.xml
!call abortmp("Do not specify ne if using a mesh file input.")
end if
if (par%masterproc) write (iulog,*) "Mesh File:", trim(mesh_file)
if (ne.eq.0) then
Expand Down
4 changes: 4 additions & 0 deletions scripts/ccsm_utils/Case.template/config_grid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,10 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<EPS_AGRID atm_grid=".+" >1.0e-12</EPS_AGRID>

<EPS_AAREA atm_grid=".+" >9.0e-07</EPS_AAREA>
<EPS_AAREA atm_grid="ne0np4_arm_x8v3_lowcon">9.0e-06</EPS_AAREA>
<EPS_AAREA atm_grid="ne0np4_conus_x4v1_lowcon">9.0e-06</EPS_AAREA>
<EPS_AAREA atm_grid="ne0np4_svalbard_x8v1_lowcon">9.0e-06</EPS_AAREA>
<EPS_AAREA atm_grid="ne0np4_sooberingoa_x4x8v1_lowcon">9.0e-06</EPS_AAREA>

<EPS_OMASK ocn_grid=".+">1.0e-06</EPS_OMASK>
<EPS_OGRID ocn_grid=".+">1.0e-02</EPS_OGRID>
Expand Down
2 changes: 1 addition & 1 deletion scripts/ccsm_utils/Machines/mkbatch.redsky
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ cat >! $file << EOF1
#===============================================================================
#SBATCH --job-name ${jobname}
#SBATCH -N ${nodes}
#SBATCH --account=${PROJECT}
#SBATCH --account=FY${PROJECT}
Copy link
Member

Choose a reason for hiding this comment

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

Breaks a bunch of stuff

#SBATCH --time=${tlimit}
#SBATCH --partition=ec

Expand Down
2 changes: 1 addition & 1 deletion scripts/ccsm_utils/Machines/mkbatch.skybridge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ cat >! $file << EOF1
#===============================================================================
#SBATCH --job-name ${jobname}
#SBATCH -N ${nodes}
#SBATCH --account=${PROJECT}
#SBATCH --account=FY${PROJECT}
Copy link
Member

Choose a reason for hiding this comment

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

Breaks a bunch of stuff

#SBATCH --time=${tlimit}
#SBATCH --partition=ec

Expand Down