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

Jump to bottom

external gridded forcing capability for SCAM #628

Open
wants to merge 9 commits into
base: cam_development
Choose a base branch
from
Open

external gridded forcing capability for SCAM #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f8fc4de
initial commit for SCAM w/ external forcing - no tested
Jul 28, 2022
8feae73
Remove unnecessary comments
cacraigucar Aug 23, 2022
7b85b0b
simple code cleanup
cacraigucar Aug 24, 2022
78192f1
Mods after first in person session
cacraigucar Aug 25, 2022
e629940
Missed one file from inital review for commit
cacraigucar Aug 25, 2022
c5378a2
Minor mods missed and fixed
cacraigucar Aug 25, 2022
4b696d8
Sync'ing up with Cheryl's clean-up
Oct 5, 2022
ba55648
disable endrun for tracer not in KG/KG
Feb 2, 2023
97094b2
Fixed bug in OMEGA time interpolation for ana forcing
Feb 3, 2023
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
95 changes: 84 additions & 11 deletions bld/namelist_files/namelist_definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3295,7 +3295,7 @@ Enables the "new" SILHS importance sampling scheme with prescribed probabilities

<entry id="subcol_silhs_l_rcm_in_cloud_k_lh_start" type="logical" category="conv"
group="silhs_config_flags_nl" valid_values="" >
Determine starting SILHS first sampling level (k_lh_start) based on maximum within-cloud rcm. If false, and if l_random_k_lh_start is also false, then the SILHS first sampling level is the column maximum of liquid cloud water.
Determine starting SILHS first sampling level (k_lh_start) based on maximum within-cloud rcm. If false, and if l_random_k_lh_start is also false, then the SILHS first sampling level is the column maximum of liquid cloud water.
</entry>

<entry id="subcol_silhs_l_random_k_lh_start" type="logical" category="conv"
Expand Down Expand Up @@ -3991,7 +3991,7 @@ of pressure and buoyancy in the wp3 predictive equation.
<entry id="clubb_l_use_shear_Richardson" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
Flag to use shear in the calculation of Richardson number.
Default: .false.
Default: .false.
</entry>

<entry id="clubb_l_use_cloud_cover" type="logical" category="pblrad"
Expand Down Expand Up @@ -4023,7 +4023,7 @@ Default: .false.

<entry id="clubb_l_e3sm_config" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
Flag to run CLUBB with E3SM settings.
Flag to run CLUBB with E3SM settings.
Default: .true.
</entry>

Expand All @@ -4039,34 +4039,34 @@ Default: .false.
<entry id="clubb_l_use_tke_in_wp2_wp3_K_dfsn" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
Flag to use Total Kenetic Energy (TKE) in eddy diffusion for wp2 and wp3.
Default: .false.
Default: .false.
</entry>

<entry id="clubb_l_use_tke_in_wp3_pr_turb_term" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
Flag to use Total Kenetic Energy (TKE) formulation for wp3 pr_turb (turbulent
Flag to use Total Kenetic Energy (TKE) formulation for wp3 pr_turb (turbulent
production) term.
Default: .false.
Default: .false.
</entry>

<entry id="clubb_l_smooth_Heaviside_tau_wpxp" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
Flag to use smooth Heaviside 'Peskin' in computation of invrs_tau.
Default: .false.
Default: .false.
</entry>

<entry id="clubb_l_godunov_upwind_wpxp_ta" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
This flag determines whether we want to use an upwind differencing approximation
rather than a centered differencing for turbulent advection terms. It affects
This flag determines whether we want to use an upwind differencing approximation
rather than a centered differencing for turbulent advection terms. It affects
wpxp only.
Default: .false.
</entry>

<entry id="clubb_l_godunov_upwind_xpyp_ta" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
This flag determines whether we want to use an upwind differencing approximation
rather than a centered differencing for turbulent advection terms. It affects
This flag determines whether we want to use an upwind differencing approximation
rather than a centered differencing for turbulent advection terms. It affects
xpyp only.
Default: .false.
</entry>
Expand Down Expand Up @@ -5551,6 +5551,79 @@ Force scam to use the lat lon fields specified in the scam namelist not what is
Default: FALSE
</entry>

<entry id="use_scm_ana_frc" type="logical" category="scam"
group="scam_nl" valid_values="">
SCAM to calculate or read tendencies from a global analysis/dycore
Default: FALSE
</entry>

<entry id="scm_ana_upwind" type="logical" category="scam"
group="scam_nl" valid_values="">
Use 1st order upwind for analysis tendencies (instead of 2nd order space centered)
Default: FALSE
</entry>

<entry id="scm_ana_t_react" type="logical" category="scam"
group="scam_nl" valid_values="">
Use scam state as center column in stencil for analysis advective tendencies
Default: FALSE
</entry>

<entry id="scm_ana_q_react" type="logical" category="scam"
group="scam_nl" valid_values="">
Use scam state as center column in stencil for analysis advective tendencies
Default: FALSE
</entry>

<entry id="scm_ana_u_react" type="logical" category="scam"
group="scam_nl" valid_values="">
Use scam state as center column in stencil for analysis advective tendencies
Default: FALSE
</entry>

<entry id="scm_ana_v_react" type="logical" category="scam"
group="scam_nl" valid_values="">
Use scam state as center column in stencil for analysis advective tendencies
Default: FALSE
</entry>

<entry id="scm_ana_direct_ttend" type="logical" category="scam"
group="scam_nl" valid_values="">
Force scam to use tendencies directly from dycore or analysis (not recalculated)
Default: FALSE
</entry>

<entry id="scm_ana_direct_omega" type="logical" category="scam"
group="scam_nl" valid_values="">
Force scam to use omega directly from dycore or analysis (not recalculated)
Default: FALSE
</entry>

<entry id="scm_ana_x_plevels" type="logical" category="scam"
group="scam_nl" valid_values="">
Interpolate analysis fields to constant pressure surfaces
Default: FALSE
</entry>


<entry id="scm_ana_frc_file_template" type="char*128" category="scam"
group="scam_nl" valid_values="" >
template for analysis forcing dataset.
Default: set by build-namelist.
</entry>

<entry id="scm_ana_frc_path" type="char*128" input_pathname="abs" category="scam"
group="scam_nl" valid_values="" >
templatefull path for analysis forcing dataset.
Default: set by build-namelist.
</entry>

<entry id="scm_use_ana_iop" type="logical" category="scam"
group="scam_nl" valid_values="">
Force scam to compute large-scale forcing from renalysis or 3D model output
Default: FALSE
</entry>

<!-- Solar Parameters -->

<entry id="solar_const" type="real" category="solar"
Expand Down
Binary file added cime_config/usermods_dirs/scam_STUB/scripts/STUB_iop.nc
View file
Open in desktop
Binary file not shown.
16 changes: 16 additions & 0 deletions cime_config/usermods_dirs/scam_STUB/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# setup SCAM lon and lat for this iop
# this should correspond to the forcing IOP coordinates
#./xmlchange PTS_LON=scmlon
#./xmlchange PTS_LAT=scmlat

# Specify the starting/ending time for the IOP
# The complete time slice of IOP file is specified below
# but you may simulate any within the IOP start and end times.
#./xmlchange RUN_STARTDATE=yyyy-mm-dd
#./xmlchange START_TOD=0
#./xmlchange STOP_OPTION=nsteps
#./xmlchange STOP_N=nnnn

# usermods_dir/scam_mandatory will be included for all single column
# runs by default. This usermods directory contains mandatory settings
# for scam and shouldn't be modified by the user.
42 changes: 42 additions & 0 deletions cime_config/usermods_dirs/scam_STUB/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
!scmlon=$PTS_LON
!scmlat=$PTS_LAT
Comment on lines +1 to +2
Copy link
Collaborator

Choose a reason for hiding this comment

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

Delete commented out lines here and below

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes

iopfile="$CASEROOT/STUB_iop.nc"
Copy link
Collaborator

Choose a reason for hiding this comment

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

The file in cime_config/usermods_dirs/scam_STUB/scripts/STUB_iop.nc should be stored in the svn inputdata repo and accessed accordingly. Will need to remove this file from the commit.

!ncdata="/home/aherring/scam/inic/SCAM_IC_288x192_L58_48_BL10.nc"
ncdata = '/glade/work/aherring/grids/vertical-res/L58/SCAM_IC_288x192_L58_48_BL10.nc'
Copy link
Collaborator

Choose a reason for hiding this comment

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

All files need to be put into the svn repo and referenced without full pathnames

Copy link
Collaborator

Choose a reason for hiding this comment

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

@JulioTBacmeister will email the list of files to put into the svn inputdata repo

Copy link
Collaborator

Choose a reason for hiding this comment

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

The files to use are one month of ERAI data from /glade/p/cdg/amp/juliob/ERAI/f09_omega/L58/2010 and will put the month "04" files into the inputdata svn repo.


!bnd_topo="/fs/cgd/csm/inputdata/atm/cam/topo/fv_0.9x1.25_nc3000_Nsw042_Nrs008_Co060_Fi001_ZR_sgh30_24km_GRNL_c170103.nc"
bnd_topo = '/glade/p/cesmdata/inputdata/atm/cam/topo/fv_0.9x1.25_nc3000_Nsw042_Nrs008_Co060_Fi001_ZR_sgh30_24km_GRNL_c170103.nc'

mfilt=2000
nhtfrq=1
avgflag_pertape(1)='A'
Comment on lines +10 to +12
Copy link
Collaborator

Choose a reason for hiding this comment

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

What fields here and below are necessary for a STUB SCAM run and which are being used for testing purposes? Should remove the ones which are not required


scm_use_obs_uv = .false.
scm_relaxation = .false.
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.
scm_relax_top_p = 200.
scm_relax_linear = .true.
scm_relax_tau_bot_sec = 864000.
scm_relax_tau_top_sec = 172800.

use_scm_ana_frc = .true.
!scm_ana_frc_path = "/project/amp/aherring/cam6_3_006.dev_FHIST_f09_f09_mg17_144pes_210818_L58_cam64_MJJA2010/run/"
scm_ana_frc_path = "/glade/p/cesm/amwg/aherring/FORC_FOR_SCAM/cam6_3_006.dev_FHIST_f09_f09_mg17_144pes_210818_L58_cam64_MJJA2010/run/"
scm_ana_frc_file_template = "cam6_3_006.dev_FHIST_f09_f09_mg17_144pes_210818_L58_cam64_MJJA2010.cam.h2.%y-%m-%d-%s.nc"

scm_ana_x_plevels = .true.
scm_ana_direct_omega = .true.
scm_ana_direct_ttend = .false.
scm_ana_t_react = .false.
scm_ana_q_react = .false.
scm_ana_u_react = .false.
scm_ana_v_react = .false.
scm_ana_upwind = .false.


use_gw_convect_dp = .false.
use_gw_convect_sh = .false.
use_gw_front = .false.
7 changes: 6 additions & 1 deletion src/chemistry/mozart/chemistry.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,7 @@ subroutine chem_init(phys_state, pbuf2d)
use fire_emissions, only : fire_emissions_init
use short_lived_species, only : short_lived_species_initic
use ocean_emis, only : ocean_emis_init
use scamMod, only : single_column

type(physics_buffer_desc), pointer :: pbuf2d(:,:)
type(physics_state), intent(in):: phys_state(begchunk:endchunk)
Expand Down Expand Up @@ -809,7 +810,11 @@ subroutine chem_init(phys_state, pbuf2d)
if ( 1.e-2_r8 >= ptop_ref .and. ptop_ref > 1.e-5_r8 ) then ! around waccm top, below top of waccmx
cnst_fixed_ubc(1) = .true.
else if ( 1.e1_r8 > ptop_ref .and. ptop_ref > 1.e-2_r8 ) then ! well above top of cam and below top of waccm
call endrun('chem_init: do not know how to set water vapor upper boundary when model top is near mesopause')
if(.not.(single_column)) then
call endrun('chem_init: do not know how to set water vapor upper boundary when model top is near mesopause')
else
cnst_fixed_ubc(1) = .true.
endif
endif

if ( masterproc ) write(iulog,*) 'chem_init: addfld done'
Expand Down
7 changes: 6 additions & 1 deletion src/chemistry/mozart/upper_bc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,16 @@ subroutine ubc_init()
use mo_snoe, only: snoe_inti
use mo_msis_ubc, only: msis_ubc_inti
use constituents,only: cnst_get_ind
use scamMod,only: single_column

!---------------------------Local workspace-----------------------------
logical :: zonal_avg
!-----------------------------------------------------------------------
apply_upper_bc = ptop_ref<1._r8 ! Pa
if (single_column) then
apply_upper_bc = .FALSE.
else
apply_upper_bc = ptop_ref<1._r8 ! Pa
endif

if (.not.apply_upper_bc) return

Expand Down
57 changes: 56 additions & 1 deletion src/control/history_scam.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ subroutine scm_intht()
call addfld ('UDIFF', (/ 'lev' /), 'A', 'K','difference from observed u wind', gridname='gauss_grid')
call addfld ('VDIFF', (/ 'lev' /), 'A', 'K','difference from observed v wind', gridname='gauss_grid')

call addfld ('TOBS', (/ 'lev' /), 'A', 'K','observed temp')
call addfld ('TOBS', (/ 'lev' /), 'A', 'K','observed temp', gridname='gauss_grid')
call addfld ('UOBS', (/ 'lev' /), 'A', 'm/s','observed zonal wind', gridname='gauss_grid')
call addfld ('VOBS', (/ 'lev' /), 'A', 'm/s','observed meridional wind', gridname='gauss_grid')

call addfld ('QDIFF', (/ 'lev' /), 'A', 'kg/kg','difference from observed water', gridname='gauss_grid')

call addfld ('QOBS', (/ 'lev' /), 'A', 'kg/kg','observed water', gridname='physgrid')
Expand Down Expand Up @@ -100,6 +103,58 @@ subroutine scm_intht()
call addfld ('NLTEN_PHYS', (/ 'lev' /), 'I','#/kg/s', 'NL vertical advective forcing', gridname='gauss_grid' )
call addfld ('NITEN_PHYS', (/ 'lev' /), 'I','#/kg/s', 'NI vertical advective forcing', gridname='gauss_grid' )

call addfld ('U_IOP', (/ 'lev' /), 'I', 'm/s', 'Zonal Wind from IOP ', gridname='gauss_grid' )
call addfld ('V_IOP', (/ 'lev' /), 'I', 'm/s', 'Mer. Wind from IOP ', gridname='gauss_grid' )
call addfld ('OMEGA_IOP', (/ 'lev' /), 'I', 'Pa/s', 'Vertical velocity (from IOP) ', gridname='gauss_grid' )
call addfld ('OMEGA_ANA', (/ 'lev' /), 'I', 'Pa/s', 'Vertical velocity (analysis) ', gridname='gauss_grid' )
call addfld ('ETAD_ANA', (/ 'lev' /), 'I', 'Pa/s', 'Eta_dot (analysis) ', gridname='gauss_grid' )
call addfld ('ZETA_ANA', (/ 'lev' /), 'I', '1/s', 'Rel. Vorticity (analysis) ', gridname='gauss_grid' )
call addfld ('T_ANA', (/ 'lev' /), 'I', 'K', 'Temperature (analysis) ', gridname='gauss_grid' )
call addfld ('Q_ANA', (/ 'lev' /), 'I', 'g/g', 'Spec. humidity (analysis) ', gridname='gauss_grid' )
call addfld ('U_ANA', (/ 'lev' /), 'I', 'm/s', 'Zonal wind (analysis) ', gridname='gauss_grid' )
call addfld ('V_ANA', (/ 'lev' /), 'I', 'm/s', 'Mer. Wind (analysis) ', gridname='gauss_grid' )
call addfld ('TV_ANA', (/ 'lev' /), 'I', 'K', 'Temperature (analysis) ', gridname='gauss_grid' )
call addfld ('TTEN_TOTDYN_ANA', (/ 'lev' /), 'I', 'K/s', 'Temperature tendency (analysis)', gridname='gauss_grid' )
call addfld ('UTEN_TOTDYN_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('VTEN_TOTDYN_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Meridional wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('QTEN_TOTDYN_ANA', (/ 'lev' /), 'I', 'kg/kg/s', 'tracer tendency (analysis)', gridname='gauss_grid' )

call addfld ('UTEN_TOTDYN_ANAR', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('VTEN_TOTDYN_ANAR', (/ 'lev' /), 'I', 'm/s/s', 'Meridional wind tendency (analysis)', gridname='gauss_grid' )

call addfld ('TTEN_DYCORE_ANA', (/ 'lev' /), 'I', 'K/s', 'Temperature tendency (analysis)', gridname='gauss_grid' )
call addfld ('OMEGA_DYCORE_ANA', (/ 'lev' /), 'I', 'Pa/s','Pressure tendency/velocity (analysis)', gridname='gauss_grid' )
call addfld ('OMEGA_RECALC_ANA', (/ 'lev' /), 'I', 'Pa/s','Pressure tendency/velocity (analysis)', gridname='gauss_grid' )

call addfld ('UTEN_DYCORE_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('UTEN_PRG_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('UTEN_PHIG_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('UTEN_KEG_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('UTEN_VORT_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('UTEN_PFRC_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('UTEN_VADV_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('UTEN_HADV_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('UTEN_CORIOL', (/ 'lev' /), 'I', 'm/s/s', 'Zonal wind tendency (analysis)', gridname='gauss_grid' )


call addfld ('VTEN_DYCORE_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Meridional wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('VTEN_VORT_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Meridional wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('VTEN_PFRC_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Meridional wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('VTEN_VADV_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Meridional wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('VTEN_HADV_ANA', (/ 'lev' /), 'I', 'm/s/s', 'Meridional wind tendency (analysis)', gridname='gauss_grid' )
call addfld ('VTEN_CORIOL', (/ 'lev' /), 'I', 'm/s/s', 'Meridional wind tendency (analysis)', gridname='gauss_grid' )

call addfld ('TTEN_VADV_ANA', (/ 'lev' /), 'I', 'K/s', 'Temperature tendency (analysis)', gridname='gauss_grid' )
call addfld ('TTEN_HADV_ANA', (/ 'lev' /), 'I', 'K/s', 'Temperature tendency (analysis)', gridname='gauss_grid' )
call addfld ('TTEN_COMP_ANA', (/ 'lev' /), 'I', 'K/s', 'Temperature tendency (analysis)', gridname='gauss_grid' )
call addfld ('TTEN_COMP_IOP', (/ 'lev' /), 'I', 'K/s', 'Temperature tendency (analysis)', gridname='gauss_grid' )

call addfld ('QTEN_VADV_ANA', (/ 'lev' /), 'I', '1/s', 'Temperature tendency (analysis)', gridname='gauss_grid' )
call addfld ('QTEN_HADV_ANA', (/ 'lev' /), 'I', '1/s', 'Temperature tendency (analysis)', gridname='gauss_grid' )

call addfld ('PS_ANA', horiz_only, 'A', 'Pa','Ana. Surface Pressure', gridname='gauss_grid')
call addfld ('PHIS_ANA', horiz_only, 'A', 'm2/s2','Ana. Surface geopotential', gridname='gauss_grid')

end subroutine scm_intht

!#######################################################################
Expand Down
24 changes: 22 additions & 2 deletions src/control/scamMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,20 @@ module scamMod
character*(max_path_len), public :: lsmsurffile
character*(max_path_len), public :: lsminifile

logical, public :: use_scm_ana_frc = .false.
character*(max_path_len), public :: scm_ana_frc_file_template
character*(max_path_len), public :: scm_ana_frc_path

logical, public :: scm_ana_x_plevels = .false.
logical, public :: scm_ana_direct_omega = .false.
logical, public :: scm_ana_direct_ttend = .false.
logical, public :: scm_ana_t_react = .false.
logical, public :: scm_ana_q_react = .false.
logical, public :: scm_ana_u_react = .false.
logical, public :: scm_ana_v_react = .false.
logical, public :: scm_ana_upwind = .false.
logical, public :: scm_use_ana_iop = .false.

! note that scm_zadv_q is set to slt to be consistent with CAM BFB testing


Expand Down Expand Up @@ -250,7 +264,11 @@ subroutine scam_readnl(nlfile,single_column_in,scmlat_in,scmlon_in)
scm_cambfb_mode,scm_crm_mode,scm_zadv_uv,scm_zadv_T,scm_zadv_q,&
scm_use_obs_T, scm_use_obs_uv, scm_use_obs_qv, &
scm_relax_linear, scm_relax_tau_top_sec, &
scm_relax_tau_bot_sec, scm_force_latlon, scm_relax_fincl, scm_backfill_iop_w_init
scm_relax_tau_bot_sec, scm_force_latlon, scm_relax_fincl, scm_backfill_iop_w_init, &
use_scm_ana_frc, scm_ana_frc_path, scm_ana_frc_file_template, &
scm_ana_x_plevels, scm_ana_direct_omega, &
scm_ana_t_react, scm_ana_q_react, scm_ana_u_react, scm_ana_v_react, &
scm_ana_upwind, scm_ana_direct_ttend, scm_use_ana_iop

single_column=single_column_in

Expand Down Expand Up @@ -306,6 +324,7 @@ subroutine scam_readnl(nlfile,single_column_in,scmlat_in,scmlon_in)
use_camiop = .false.
endif


! If we are not forcing the lat and lon from the namelist use the closest lat and lon that is found in the IOP file.
if (.not.scm_force_latlon) then
call shr_scam_GetCloseLatLon( ncid, scmlat, scmlon, ioplat, ioplon, latidx, lonidx )
Expand All @@ -316,7 +335,8 @@ subroutine scam_readnl(nlfile,single_column_in,scmlat_in,scmlon_in)
scmlat = ioplat
scmlon = ioplon
end if



if (masterproc) then
write (iulog,*) 'Single Column Model Options: '
write (iulog,*) '============================='
Expand Down
4 changes: 2 additions & 2 deletions src/dynamics/eul/dyn_comp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,8 +842,8 @@ subroutine process_inidat(fieldname, m_cnst, fh)
ret = pio_inq_varid(fh, cnst_name(m_cnst), varid)
ret = pio_get_att(fh, varid, 'units', trunits)
if (trunits(1:5) .ne. 'KG/KG' .and. trunits(1:5) .ne. 'kg/kg') then
call endrun(sub//': ERROR: Units for tracer ' &
//trim(cnst_name(m_cnst))//' must be in KG/KG')
!call endrun(sub//': ERROR: Units for tracer ' &
! //trim(cnst_name(m_cnst))//' must be in KG/KG')
end if

else if (.not. analytic_ic_active()) then
Expand Down
Loading