Skip to content

Update #3

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

Merged
theoc merged 23 commits into from
Nov 4, 2020
Merged

Update #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ac13d26
Fixed typo "Makfile" to "Makefile" in clean_kpp (#1187)
michaelbnewman May 5, 2020
c66a806
Define "issue" template (#1225)
davegill Jul 9, 2020
4dede71
bug fix for VarBC when num_fgat_time > 1
YaliWu0219 Jul 9, 2020
28b84b7
Replace "derf()" with standard "erf()" in SBM MP scheme (#1183)
kkeene44 Jul 10, 2020
e2f6605
Filling aerssa2d and aerasy2d for sw = 5 and prescribed values from t…
pedro-jm Jul 10, 2020
74746a4
Fix occurrence of time for max/min of diagnostics in clWRF (#1208)
christopherthomas Jul 10, 2020
ab2ca85
Fix INTEGER interpolation and feedback Registry arguments (#1213)
YulongMa Jul 10, 2020
ae26db3
fixed divide by zero in Shin-Hong PBL (#1219)
matzegoebel Jul 10, 2020
c387578
Remove nonstandard spacing in macro as workaround for LLVM bug #18011…
irowebbn Jul 10, 2020
cdca0a2
Release v4.2.1 Fire compile error (#1223)
MicroTed Jul 10, 2020
fa2d554
solar diag time series segfault - package needs variables (#1228)
davegill Jul 10, 2020
962288f
Bug fix advection TKE generated by wind farms (#1235)
pedro-jm Jul 10, 2020
a3b3b78
Fix 1d advection testing program, broken with hybrid vert coord (#1247)
davegill Jul 10, 2020
26c947c
fixed slope calculation at domain boundary for periodic boundary cond…
matzegoebel Jul 10, 2020
9eaa5d0
Update PR commit message templates (#1255)
davegill Jul 14, 2020
f111afe
NSSL Microphysics log(0) FPE (#1216)
MicroTed Jul 14, 2020
2ebe4e9
Update READMEs for rinblw: add "max_dom" (#1248)
pengzimu Jul 15, 2020
7248de4
Disable TUV diagnostics unless debugging (#1243)
zxdawn Jul 15, 2020
55da5ef
bug fix for m_opt: fixed units of surface momentum flux" (#1214)
matzegoebel Jul 15, 2020
9d78acf
Radiative heat tendencies were in reversed order in the argument list…
jhruppert Jul 20, 2020
6502d5d
Various syntax fixes found by FPT tool (static Fortran analysis mode)…
JCollinsSimCon Jul 22, 2020
b158a15
Update version numbers to v4.2.1 (#1261)
davegill Jul 22, 2020
f311cd5
Merge remote-tracking branch 'origin/release-v4.2.1'
smileMchen Jul 22, 2020
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
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Bug report
about: 'Issues are typically for demonstrable errors in the software. User problems
with a build should be directed to the WRF Forum: forum.mmm.ucar.edu'
title: ''
labels: ''
assignees: davegill

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Use compiler and version '....'
2. Use namelist options '....'
3. Output is '....'

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Attachments**
If applicable, attach supporting files: namelist.input, rsl.* files, etc.

**Additional context**
Add any other context about the problem here, such as:
- This used to work with a previous version.
- The documentation is different from the exhibited behavior.
22 changes: 12 additions & 10 deletions .github/PULL_REQUEST_TEMPLATE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
Use this template to give a detailed message describing the change you want to make to the code.
If you are unclear on what should be written here, see https://github.com/wrf-model/WRF/wiki/Making-a-good-pull-request-message for more guidance

The title of this pull request should be a brief "purpose" for this change.

--- Delete this line and those above before hitting "Create pull request" ---
The first line should be a single-line "purpose" for this change

TYPE: choose one of [bug fix, enhancement, new feature, feature removed, no impact, text only]

KEYWORDS: approximately 3 to 6 words (more is always better) related to your commit, separated by commas
KEYWORDS: 5 to 10 words related to commit, separated by commas

SOURCE: Either "developer's name (affiliation)" .XOR. "internal" for a WRF Dev committee member

DESCRIPTION OF CHANGES: One or more paragraphs describing problem, solution, and required changes.
DESCRIPTION OF CHANGES:
Problem:
Generally or specifically, what was wrong and needed to be addressed?

Solution:
What was down algorithmically and in the source code to address the problem?

ISSUE: For use when this PR closes an issue. For example, if this PR closes issue number 123
ISSUE: For use when this PR closes an issue.
Fixes #123

LIST OF MODIFIED FILES: list of changed files (use `git diff --name-status master` to get formatted list)

TESTS CONDUCTED: Explicitly state if a WTF and or other tests were run, or are pending. For more complicated changes please be explicit!
TESTS CONDUCTED:
1. Do mods fix problem? How can that be demonstrated, and was that test conducted?
2. Are the Jenkins tests all passing?

RELEASE NOTE: Include a stand-alone message suitable for the inclusion in the minor and annual releases. A publication citation is appropriate.
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WRF Model Version 4.2
WRF Model Version 4.2.1

http://www2.mmm.ucar.edu/wrf/users/

Expand Down
7 changes: 4 additions & 3 deletions Registry/Registry.EM_COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ state real G_URB2D ij misc 1 - rd=(interp_f
state real RN_URB2D ij misc 1 - rd=(interp_fcnm)u=(copy_fcnm) "RN_URB" "NET RADIATION ON URBAN SFC" "W m{-2}"
state real TS_URB2D ij misc 1 - rd=(interp_fcnm)u=(copy_fcnm) "TS_URB" "SKIN TEMPERATURE" "K"
state real FRC_URB2D ij misc 1 - i012rd=(interp_fcnm)u=(copy_fcnm) "FRC_URB2D" "URBAN FRACTION" "dimensionless"
state integer UTYPE_URB2D ij misc 1 - rd=(interp_fcnm)u=(copy_fcnm) "UTYPE_URB" "URBAN TYPE" "dimensionless"
state integer UTYPE_URB2D ij misc 1 - rd=(interp_fcni)u=(copy_fcni) "UTYPE_URB" "URBAN TYPE" "dimensionless"
state real TRB_URB4D i{umap1}j misc 1 Z r "TRB_URB4D" "ROOF LAYER TEMPERATURE" "K"
state real TW1_URB4D i{umap2}j misc 1 Z r "TW1_URB4D" "WALL LAYER TEMPERATURE" "K"
state real TW2_URB4D i{umap2}j misc 1 Z r "TW2_URB4D" "WALL LAYER TEMPERATURE" "K"
Expand Down Expand Up @@ -1763,7 +1763,7 @@ state real LH_URB2D_mosaic i{mocat}j misc 1 - r
state real G_URB2D_mosaic i{mocat}j misc 1 - r "G_URB2D_mosaic" "GROUND HEAT FLUX AT THE SURFACE" "W m-2"
state real RN_URB2D_mosaic i{mocat}j misc 1 - r "RN_URB2D_mosaic" "NET RADIATION" "W m-2"

state integer mosaic_cat_index iuj misc 1 Z i012rd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "mosaic_cat_index" " " ""
state integer mosaic_cat_index iuj misc 1 Z i012rd=(interp_fcni)u=(copy_fcni) "mosaic_cat_index" " " ""
state real landusef2 iuj misc 1 Z i012rdu "LANDUSEF2" "sorted landuse fraction" ""

# State vector for etampnew microphysics. Must be declared state because it is not read-once and is needed for restarting.
Expand Down Expand Up @@ -2782,6 +2782,7 @@ state integer nodyn_dummy - dyn_nodyn - - - "" "" ""
# Turbine drag physics.
rconfig integer windfarm_opt namelist,physics max_domains 0 rh "windfarm_opt" "" ""
rconfig integer windfarm_ij namelist,physics 1 0 rh "windfarm_ij" "" ""
rconfig real windfarm_tke_factor namelist,physics 1 0.25 rh "windfarm_tke_factor" "" ""
#
# Ideal case selection
rconfig integer ideal_case namelist,ideal 1 0 rh "ideal_case" "" ""
Expand Down Expand Up @@ -3062,7 +3063,7 @@ package icedepth_one seaice_thickness_opt==1 - state:icedept
#Time series options for text output
package notseries process_time_series==0 - -
package tseries process_time_series==1 - state:ts_hour,ts_u,ts_v,ts_q,ts_t,ts_psfc,ts_glw,ts_gsw,ts_hfx,ts_lh,ts_tsk,ts_tslb,ts_clw,ts_rainc,ts_rainnc,ts_u_profile,ts_v_profile,ts_gph_profile,ts_th_profile,ts_p_profile,ts_w_profile
package tseries_add_solar process_time_series==2 - state:ts_hour,ts_u,ts_v,ts_q,ts_t,ts_psfc,ts_glw,ts_gsw,ts_hfx,ts_lh,ts_tsk,ts_tslb,ts_clw,ts_rainc,ts_rainnc,ts_u_profile,ts_v_profile,ts_gph_profile,ts_th_profile,ts_cldfrac2d,ts_wvp,ts_lwp,ts_iwp,ts_swp,ts_lwp_tot,ts_iwp_tot,ts_swp_tot,ts_re_qc,ts_re_qi,ts_re_qs,ts_re_qc_tot,ts_re_qi_tot,ts_re_qs_tot,ts_tau_qc,ts_tau_qi,ts_tau_qs,ts_tau_qc_tot,ts_tau_qi_tot,ts_tau_qs_tot,ts_cbaseht,ts_ctopht,ts_cbaseht_tot,ts_ctopht_tot,ts_clrnidx
package tseries_add_solar process_time_series==2 - state:ts_hour,ts_u,ts_v,ts_q,ts_t,ts_psfc,ts_glw,ts_gsw,ts_hfx,ts_lh,ts_tsk,ts_tslb,ts_clw,ts_rainc,ts_rainnc,ts_u_profile,ts_v_profile,ts_gph_profile,ts_th_profile,ts_cldfrac2d,ts_wvp,ts_lwp,ts_iwp,ts_swp,ts_lwp_tot,ts_iwp_tot,ts_swp_tot,ts_re_qc,ts_re_qi,ts_re_qs,ts_re_qc_tot,ts_re_qi_tot,ts_re_qs_tot,ts_tau_qc,ts_tau_qi,ts_tau_qs,ts_tau_qc_tot,ts_tau_qi_tot,ts_tau_qs_tot,ts_cbaseht,ts_ctopht,ts_cbaseht_tot,ts_ctopht_tot,ts_clrnidx,ts_p_profile,ts_w_profile

# WRF-HAILCAST
state real HAILCAST_DHAIL1 ij misc 1 - r "HAILCAST_DHAIL1" "WRF-HAILCAST Hail Diameter, 1st rank order" "mm"
Expand Down
1 change: 1 addition & 0 deletions Registry/Registry.NMM
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,7 @@ rconfig integer ysu_topdown_pblmix namelist,physics max_domains 0
rconfig integer shinhong_tke_diag namelist,physics max_domains 0 rh "shinhong_tke_diag" "" ""
rconfig integer windfarm_opt namelist,physics max_domains 0 rh "windfarm_opt" "" ""
rconfig integer windfarm_ij namelist,physics 1 0 rh "windfarm_ij" "" ""
rconfig real windfarm_tke_factor namelist,physics 1 0.25 rh "windfarm_tke_factor" "" ""
rconfig integer mfshconv namelist,physics max_domains 1 rh "mfshconv" "To activate mass flux scheme with qnse, 1=true; 0=false" ""
rconfig real BLDT namelist,physics max_domains 0 h "BLDT" "" ""
rconfig integer cu_physics namelist,physics max_domains 0 rh0123 "cu_physics" "" ""
Expand Down
6 changes: 3 additions & 3 deletions Registry/registry.clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# CLM Variables

state integer NUMC ij misc 1 Z rd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "NUMC" "NUMBER OF COLUMN SUBGRIDS" " "
state integer NUMP ij misc 1 Z rd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "NUMP" "NUMBER OF PFT SUBGRIDS" " "
state integer NUMC ij misc 1 Z rd=(interp_fcni)u=(copy_fcni) "NUMC" "NUMBER OF COLUMN SUBGRIDS" " "
state integer NUMP ij misc 1 Z rd=(interp_fcni)u=(copy_fcni) "NUMP" "NUMBER OF PFT SUBGRIDS" " "
state real SABV ij misc 1 Z h "SABV" "NET VEGETATION SOLAR RADIATION" "W m-2"
state real SABG ij misc 1 Z h "SABG" "NET SOIL SOLAR RADIATION" "W m-2"
state real LWUP ij misc 1 Z h "LWUP" "OUTGOING LONGWAVE RADIATION" "W m-2"
state real LHSOI i4j misc 1 Z h "LHSOI" "LH from soil" "W/m^2"
state real LHVEG i4j misc 1 Z h "LHVEG" "LH from vegetation" "W/m^2"
state real LHTRAN i4j misc 1 Z h "LHTRAN" "LH from transpiration" "W/m^2"
state integer SNL i4j misc 1 Z rd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "SNL" "NUMBER OF SNOW LAYERS" " "
state integer SNL i4j misc 1 Z rd=(interp_fcni)u=(copy_fcni) "SNL" "NUMBER OF SNOW LAYERS" " "
state real SNOWDP i4j misc 1 Z rd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "SNOWDP" "SUBGRID SNOW DEPTH" "m"
state real WTC i4j misc 1 Z rd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "WTC" "COLUMN WEIGHT" "fraction"
state real WTP i4j misc 1 Z rd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "WTP" "PFT WEIGHT" "fraction"
Expand Down
2 changes: 1 addition & 1 deletion Registry/registry.noahmp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# For Noah-MP
state integer isnowxy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "isnow" "no. of snow layer" "m3 m-3"
state integer isnowxy ij - 1 - i02rhd=(interp_fcni)u=(copy_fcni) "isnow" "no. of snow layer" "m3 m-3"
state real tvxy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "tv" "vegetation leaf temperature" "K"
state real tgxy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "tg" "bulk ground temperature" "K"
state real canicexy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "canice" "intercepted ice mass" "mm"
Expand Down
2 changes: 1 addition & 1 deletion chem/KPP/clean_kpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ echo "# DO NOT EDIT! Placeholder for automatically generated file" >& configu
# remove the traces of KPP
if (-e ../Makefile_org ) then
cp -f ../Makefile_org ../Makefile
rm -f ../Makfile_org
rm -f ../Makefile_org
endif


Expand Down
7 changes: 5 additions & 2 deletions chem/rxn.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,11 @@ SUBROUTINE rxn_init( nw, wl )
integer, intent(in) :: nw
real, intent(in) :: wl(nw)

integer :: astat, m, n
integer :: astat, m, n, debug_level
character(len=256) :: emsg

call set_initialization( status=.true. )
call get_wrf_debug_level( debug_level )

if( .not. allocated( xsqy_tab ) ) then
allocate( xsqy_tab(kj),stat=astat )
Expand Down Expand Up @@ -200,7 +201,9 @@ SUBROUTINE rxn_init( nw, wl )
npht_tab = 2
call setup_sub_calls( the_subs,npht_tab )

call diagnostics
IF ( 100 .LE. debug_level ) THEN
call diagnostics
ENDIF

call rdxs_init( nw, wl )

Expand Down
35 changes: 22 additions & 13 deletions dyn_em/module_advect_em.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!WRF:MODEL_LAYER:DYNAMICS
!
#if ( defined(ADVECT_KERNEL) )
! cpp -traditional -C -P -DADVECT_KERNEL module_advect_em.F > advection_kernel.f90
! cpp -traditional-cpp -P -DADVECT_KERNEL module_advect_em.F > advection_kernel.f90
! gfortran -ffree-form -ffree-line-length-none advection_kernel.f90
! ./a.out
MODULE advection_kernel
Expand Down Expand Up @@ -10558,7 +10558,8 @@ PROGRAM feeder
msfty
REAL , DIMENSION( : ), ALLOCATABLE :: fzm, &
fzp, &
rdzw, znw,dnw, rdnw, dn, rdn
rdzw, znw,dnw, rdnw, dn, rdn, &
c1, c2
REAL :: rdx, &
rdy, &
dt
Expand Down Expand Up @@ -10607,6 +10608,8 @@ PROGRAM feeder
ALLOCATE (rdnw( kms:kme ) )
ALLOCATE ( dn ( kms:kme ) )
ALLOCATE (rdn ( kms:kme ) )
ALLOCATE ( c1 ( kms:kme ) )
ALLOCATE ( c2 ( kms:kme ) )
PRINT *,'CALL init'
CALL init ( config_flags)
CALL tophat ( field , MAX_SCALARS ,&
Expand Down Expand Up @@ -10649,6 +10652,10 @@ PROGRAM feeder
fzp(k) = .5* dnw(k )/dn(k)
fzm(k) = .5* dnw(k-1)/dn(k)
ENDDO
DO k = kts,kte
c1(k) = 1. ! This is d(B)/d(eta), so assuming no hyb coord
c2(k) = 0. ! This (1 - c1)*(p00 - ptop)
ENDDO

time_step = 5
dt = time_step
Expand All @@ -10668,8 +10675,8 @@ PROGRAM feeder
CALL advect_scalar ( field(ims,kms,jms,im), &
field_old(ims,kms,jms,im), &
tendency(ims,kms,jms), &
ru, rv, rom, &
mut, time_step/3, config_flags, &
ru, rv, rom, c1, c2, &
mut, time_step/3, config_flags,&
msfux, msfuy, msfvx, msfvy, &
msftx, msfty, &
fzm, fzp, &
Expand All @@ -10685,8 +10692,8 @@ PROGRAM feeder
CALL advect_scalar ( field(ims,kms,jms,im), &
field_old(ims,kms,jms,im), &
tendency(ims,kms,jms), &
ru, rv, rom, &
mut, time_step/2, config_flags, &
ru, rv, rom, c1, c2, &
mut, time_step/2, config_flags,&
msfux, msfuy, msfvx, msfvy, &
msftx, msfty, &
fzm, fzp, &
Expand All @@ -10703,7 +10710,7 @@ PROGRAM feeder
CALL advect_scalar ( field(ims,kms,jms,im), &
field_old(ims,kms,jms,im), &
tendency(ims,kms,jms), &
ru, rv, rom, &
ru, rv, rom, c1, c2, &
mut, time_step, config_flags, &
msfux, msfuy, msfvx, msfvy, &
msftx, msfty, &
Expand All @@ -10718,7 +10725,8 @@ PROGRAM feeder
tendency(ims,kms,jms), &
h_tendency(ims,kms,jms), &
z_tendency(ims,kms,jms), &
ru, rv, rom, mut, mub, mu_old, &
ru, rv, rom, c1, c2, &
mut, mub, mu_old, &
time_step, config_flags, tenddec, &
msfux, msfuy, msfvx, msfvy, &
msftx, msfty, fzm, fzp, &
Expand All @@ -10732,7 +10740,8 @@ PROGRAM feeder
tendency(ims,kms,jms), &
h_tendency(ims,kms,jms), &
z_tendency(ims,kms,jms), &
ru, rv, rom, mut, mub, mu_old, &
ru, rv, rom, c1, c2, &
mut, mub, mu_old, &
config_flags, tenddec, &
msfux, msfuy, msfvx, msfvy, &
msftx, msfty, fzm, fzp, &
Expand All @@ -10744,7 +10753,7 @@ PROGRAM feeder
CALL advect_scalar_weno ( field(ims,kms,jms,im), &
field_old(ims,kms,jms,im), &
tendency(ims,kms,jms), &
ru, rv, rom, &
ru, rv, rom, c1, c2, &
mut, time_step, config_flags, &
msfux, msfuy, msfvx, msfvy, &
msftx, msfty, &
Expand All @@ -10757,7 +10766,7 @@ PROGRAM feeder
CALL advect_scalar_wenopd ( field(ims,kms,jms,im), &
field_old(ims,kms,jms,im), &
tendency(ims,kms,jms), &
ru, rv, rom, &
ru, rv, rom, c1, c2, &
mut, mub, mu_old, &
time_step, config_flags, &
msfux, msfuy, msfvx, msfvy, &
Expand Down Expand Up @@ -10803,7 +10812,7 @@ PROGRAM feeder
print *,' '
print *,'Lines to input to gnuplot'
print *,' '
print *,"set term x11"
print *,"set terminal x11"
IF (config_flags%scalar_adv_opt .EQ. 0 ) THEN
print *,'set title "Scalar Advection" font ",20"'
ELSE IF (config_flags%scalar_adv_opt .EQ. 1 ) THEN
Expand All @@ -10812,7 +10821,7 @@ PROGRAM feeder
print *,'set title "Mono Advection" font ",20"'
ELSE IF (config_flags%scalar_adv_opt .EQ. 3 ) THEN
print *,'set title "WENO Advection" font ",20"'
ELSE IF (config_flags%scalar_adv_opt .EQ. 3 ) THEN
ELSE IF (config_flags%scalar_adv_opt .EQ. 4 ) THEN
print *,'set title "WENO PD Advection" font ",20"'
END IF
print *,"set yrange[-20:120]"
Expand Down
Loading