Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
[submodule "phys/MYNN-EDMF"]
path = phys/MYNN-EDMF
url = https://github.com/NCAR/MYNN-EDMF
[submodule "phys/TEMPO"]
path = phys/TEMPO
url = https://github.com/NCAR/TEMPO.git
[submodule "phys/MYNN-SFC"]
path = phys/MYNN-SFC
url = https://github.com/NCAR/MYNN-SFC.git
[submodule "phys/GFL"]
path = phys/GFL
url = https://github.com/NOAA-GSL/GFL
[submodule "phys/TEMPO"]
path = phys/TEMPO
url = https://github.com/NCAR/TEMPO.git
2 changes: 1 addition & 1 deletion Registry/Registry.EM_COMMON
Original file line number Diff line number Diff line change
Expand Up @@ -3241,7 +3241,7 @@ package mynnpblscheme_dfi bl_pbl_physics_dfi==5 - dfi_scalar:dfi
package nocuscheme cu_physics==0 - -
package kfetascheme cu_physics==1 - state:w0avg
package bmjscheme cu_physics==2 - state:qcconv,qiconv,convcld,ccldfra
package gfscheme cu_physics==3 - state:cugd_qvten,cugd_tten,cugd_qvtens,cugd_ttens,cugd_qcten,xmb_shallow,k22_shallow,kbcon_shallow,ktop_shallow
package gflscheme cu_physics==3 - state:cugd_qvten,cugd_tten,cugd_qvtens,cugd_ttens,cugd_qcten,xmb_shallow,k22_shallow,kbcon_shallow,ktop_shallow
package scalesasscheme cu_physics==4 - -
package g3scheme cu_physics==5 - state:cugd_qvten,cugd_tten,cugd_qvtens,cugd_ttens,cugd_qcten,xmb_shallow,k22_shallow,kbcon_shallow,ktop_shallow
package tiedtkescheme cu_physics==6 - -
Expand Down
2 changes: 1 addition & 1 deletion chem/chem_driver.F
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ end SUBROUTINE sum_pm_driver
!
if( config_flags%cu_physics>0 .and. config_flags%chem_conv_tr>0 &
.and. config_flags%cu_physics/=kfcupscheme &
.and. config_flags%cu_physics/=gfscheme ) then !BSINGH - For WRFCuP scheme
.and. config_flags%cu_physics/=gflscheme ) then !BSINGH - For WRFCuP scheme
call wrf_debug(15,'calling conv transport for chemical species')
if(config_flags%chem_opt >0 )then
! save old concentrations for convective tendencies
Expand Down
6 changes: 3 additions & 3 deletions dyn_em/module_big_step_utilities_em.F
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MODULE module_big_step_utilities_em

USE module_model_constants
USE module_state_description, only: p_qg, p_qs, p_qi, gdscheme, tiedtkescheme, ntiedtkescheme, kfetascheme, mskfscheme, &
g3scheme, gfscheme,p_qv, param_first_scalar, p_qr, p_qc, DFI_FWD
g3scheme, gflscheme,p_qv, param_first_scalar, p_qr, p_qc, DFI_FWD
USE module_configure, ONLY : grid_config_rec_type
USE module_wrf_error

Expand Down Expand Up @@ -5287,7 +5287,7 @@ SUBROUTINE phy_prep_part2 ( config_flags, &
! decouple advective forcing required by a few CPS schemes

IF(( config_flags%cu_physics == GDSCHEME ) .OR. &
( config_flags%cu_physics == GFSCHEME ) .OR. &
( config_flags%cu_physics == GFLSCHEME ) .OR. &
( config_flags%cu_physics == G3SCHEME ) .OR. &
( config_flags%cu_physics == KFETASCHEME ) .OR. &
( config_flags%cu_physics == MSKFSCHEME ) .OR. &
Expand All @@ -5307,7 +5307,7 @@ SUBROUTINE phy_prep_part2 ( config_flags, &
END IF

IF(( config_flags%cu_physics == GDSCHEME ) .OR. &
( config_flags%cu_physics == GFSCHEME ) .OR. &
( config_flags%cu_physics == GFLSCHEME ) .OR. &
( config_flags%cu_physics == G3SCHEME ) .OR. &
( config_flags%cu_physics == NTIEDTKESCHEME )) THEN

Expand Down
4 changes: 2 additions & 2 deletions dyn_em/module_convtrans_prep.F
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ subroutine convtrans_prep(gd_cloud,gd_cloud2,gd_cloud_a, &
!
if(cu_phys.eq.3.or.cu_phys.eq.5.or.cu_phys.eq.93)then
! if(config_flags%cu_physics == GDSCHEME .OR. &
! config_flags%cu_physics == GFSCHEME .OR. &
! config_flags%cu_physics == GFSCHEME ) THEN
! config_flags%cu_physics == GFLSCHEME .OR. &
! config_flags%cu_physics == GFLSCHEME ) THEN
! pmax=maxval(gd_cloud)
! pmin=maxval(gd_cloud2)
! print *,pmax,pmin
Expand Down
6 changes: 3 additions & 3 deletions dyn_em/module_em.F
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ MODULE module_em
USE module_ieva_em, only: advect_u_implicit, advect_v_implicit, advect_w_implicit, advect_s_implicit, advect_ph_implicit, &
chk_ieva, ww_split, calc_mut_new
USE module_state_description, only: param_first_scalar, p_qr, p_qv, p_qc, p_qg, p_qi, p_qs, tiedtkescheme,ntiedtkescheme, heldsuarez, &
positivedef, gdscheme, g3scheme, gfscheme, kfetascheme, mskfscheme, monotonic, wenopd_scalar, weno_scalar, weno_mom
positivedef, gdscheme, g3scheme, gflscheme, kfetascheme, mskfscheme, monotonic, wenopd_scalar, weno_scalar, weno_mom

USE module_damping_em, only: held_suarez_damp

Expand Down Expand Up @@ -652,7 +652,7 @@ SUBROUTINE rk_tendency ( config_flags, rk_step, &
ENDIF

IF ( config_flags%cu_physics == GDSCHEME .OR. &
config_flags%cu_physics == GFSCHEME .OR. &
config_flags%cu_physics == GFLSCHEME .OR. &
config_flags%cu_physics == G3SCHEME .OR. &
config_flags%cu_physics == NTIEDTKESCHEME ) THEN ! NTiedtke

Expand Down Expand Up @@ -1364,7 +1364,7 @@ SUBROUTINE rk_scalar_tend ( scs, sce, config_flags, &
ENDIF

IF((config_flags%cu_physics == GDSCHEME .OR. config_flags%cu_physics == G3SCHEME .OR. &
config_flags%cu_physics == GFSCHEME .OR. &
config_flags%cu_physics == GFLSCHEME .OR. &
config_flags%cu_physics == KFETASCHEME .OR. config_flags%cu_physics == MSKFSCHEME .OR. &
config_flags%cu_physics == TIEDTKESCHEME .OR. config_flags%cu_physics == NTIEDTKESCHEME ) & ! Tiedtke
.and. moist_step .and. ( im == P_QV) ) THEN
Expand Down
1 change: 1 addition & 0 deletions phys/GFL
Submodule GFL added at ec9b3b
47 changes: 29 additions & 18 deletions phys/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ MODULES = \
module_cu_tiedtke.o\
module_cu_ntiedtke.o\
module_cu_gd.o \
module_cu_gf_ctrans.o \
module_cu_gf_wrfdrv.o \
module_cu_gf_deep.o \
module_cu_gf_sh.o \
module_cu_gfl_common.o \
module_cu_gfl_deep.o \
module_cu_gfl_sh.o \
module_cu_gfl_wrf.o \
module_cu_ksas.o \
module_cu_nsas.o \
module_cu_sas.o \
Expand Down Expand Up @@ -461,6 +461,30 @@ submodules :
else \
echo No action required for MYNN-EDMF submodule ; \
fi
@if [ \( ! -f module_sf_mynnsfc_driver.F \) -o \( ! -f module_sf_mynnsfc_common.F \) -o \
\( ! -f module_sf_mynnsfc_land.F \) -o \( ! -f module_sf_mynnsfc_water.F \) -o \
\( ! -f module_sf_mynnsfc_ice.F \) ] ; then \
echo Pulling in MYNN-SFC submodule ; \
( cd .. ; git submodule update --init --recursive ) ; \
ln -sf MYNN-SFC/WRF/module_sf_mynnsfc_driver.F90 module_sf_mynnsfc_driver.F ; \
ln -sf MYNN-SFC/WRF/module_sf_mynnsfc_common.F90 module_sf_mynnsfc_common.F ; \
ln -sf MYNN-SFC/module_sf_mynnsfc_land.F90 module_sf_mynnsfc_land.F ; \
ln -sf MYNN-SFC/module_sf_mynnsfc_water.F90 module_sf_mynnsfc_water.F ; \
ln -sf MYNN-SFC/module_sf_mynnsfc_ice.F90 module_sf_mynnsfc_ice.F ; \
else \
echo No action required for MYNN-SFC submodule ; \
fi
@if [ \( ! -f module_cu_gfl_wrf.F \) -o \( ! -f module_cu_gfl_common.F \) -o \
\( ! -f module_cu_gfl_deep.F \) -o \( ! -f module_cu_gfl_sh.F \) ] ; then \
echo Pulling in GFL submodule ; \
( cd .. ; git submodule update --init --recursive ) ; \
ln -sf GFL/module_cu_gfl_sh.F90 module_cu_gfl_sh.F; \
ln -sf GFL/module_cu_gfl_deep.F90 module_cu_gfl_deep.F; \
ln -sf GFL/WRF/module_cu_gfl_common.F90 module_cu_gfl_common.F ; \
ln -sf GFL/WRF/module_cu_gfl_wrf.F90 module_cu_gfl_wrf.F ; \
else \
echo No action required for GFL submodule ; \
fi
@if [ \( ! -f module_mp_tempo_driver.F90 \) -o \( ! -f module_mp_tempo_main.F90 \) -o \
\( ! -f module_mp_tempo_cfgs.F90 \) -o \( ! -f module_mp_tempo_aerosols.F90 \) -o \
\( ! -f module_mp_tempo_ml.F90 \) -o \( ! -f modulemp_tempo_diags.F90 \) -o \
Expand All @@ -478,20 +502,7 @@ submodules :
else \
echo No action required for TEMPO submodule ; \
fi

@if [ \( ! -f module_sf_mynnsfc_driver.F \) -o \( ! -f module_sf_mynnsfc_common.F \) -o \
\( ! -f module_sf_mynnsfc_land.F \) -o \( ! -f module_sf_mynnsfc_water.F \) -o \
\( ! -f module_sf_mynnsfc_ice.F \) ] ; then \
echo Pulling in MYNN-SFC submodule ; \
( cd .. ; git submodule update --init --recursive ) ; \
ln -sf MYNN-SFC/WRF/module_sf_mynnsfc_driver.F90 module_sf_mynnsfc_driver.F ; \
ln -sf MYNN-SFC/WRF/module_sf_mynnsfc_common.F90 module_sf_mynnsfc_common.F ; \
ln -sf MYNN-SFC/module_sf_mynnsfc_land.F90 module_sf_mynnsfc_land.F ; \
ln -sf MYNN-SFC/module_sf_mynnsfc_water.F90 module_sf_mynnsfc_water.F ; \
ln -sf MYNN-SFC/module_sf_mynnsfc_ice.F90 module_sf_mynnsfc_ice.F ; \
else \
echo No action required for MYNN-SFC submodule ; \
fi

clean:
@ echo 'use the clean script'

Expand Down
Loading