Skip to content

Commit

Permalink
remove old Thompson microphysics (mp98)
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn-wrf-model.cgd.ucar.edu/trunk@4641 b0b5d27b-6f0f-0410-a2a3-cb1e977edc3d
  • Loading branch information
@dudhia
dudhia committed Jan 7, 2011
1 parent 286ba95 commit 8370f6f
Show file tree
Hide file tree
Showing 12 changed files with 3 additions and 3,312 deletions.
2 changes: 0 additions & 2 deletions Registry/Registry.EM
View file
Expand Up @@ -1855,7 +1855,6 @@ package morr_two_moment mp_physics==10 - moist:qv,qc,q
package sbu_ylinscheme mp_physics==13 - moist:qv,qc,qr,qi,qs;state:rimi
package wdm5scheme mp_physics==14 - moist:qv,qc,qr,qi,qs;scalar:qnn,qnc,qnr
package wdm6scheme mp_physics==16 - moist:qv,qc,qr,qi,qs,qg;scalar:qnn,qnc,qnr
package thompson07 mp_physics==98 - moist:qv,qc,qr,qi,qs,qg;scalar:qni

package nodfimoist mp_physics_dfi==-1 - -
package passiveqv_dfi mp_physics_dfi==0 - dfi_moist:dfi_qv
Expand All @@ -1872,7 +1871,6 @@ package morr_two_moment_dfi mp_physics_dfi==10 - dfi_moist:dfi
#package milbrandt3mom_dfi mp_physics_dfi==12 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg,dfi_qh;dfi_scalar:dfi_qnc,dfi_qnr,dfi_qni,dfi_qns,dfi_qng,dfi_qnh,dfi_qzr,dfi_qzi,dfi_qzs,dfi_qzg,dfi_qzh
package wdm5scheme_dfi mp_physics_dfi==14 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package wdm6scheme_dfi mp_physics_dfi==16 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package thompson07_dfi mp_physics_dfi==98 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qni

package noprogn progn==0 - -
package progndrop progn==1 - scalar:qndrop;dfi_scalar:dfi_qndrop
Expand Down
2 changes: 0 additions & 2 deletions Registry/Registry.EM_CHEM
View file
Expand Up @@ -1830,7 +1830,6 @@ package morr_two_moment mp_physics==10 - moist:qv,qc,q
package sbu_ylinscheme mp_physics==13 - moist:qv,qc,qr,qi,qs;state:rimi
package wdm5scheme mp_physics==14 - moist:qv,qc,qr,qi,qs;scalar:qnn,qnc,qnr
package wdm6scheme mp_physics==16 - moist:qv,qc,qr,qi,qs,qg;scalar:qnn,qnc,qnr
package thompson07 mp_physics==98 - moist:qv,qc,qr,qi,qs,qg;scalar:qni

package passiveqv_dfi mp_physics_dfi==0 - dfi_moist:dfi_qv
package kesslerscheme_dfi mp_physics_dfi==1 - dfi_moist:dfi_qv,dfi_qc,dfi_qr
Expand All @@ -1846,7 +1845,6 @@ package morr_two_moment_dfi mp_physics_dfi==10 - dfi_moist:dfi
package sbu_ylinscheme_dfi mp_physics==13 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs;state:rimi
package wdm5scheme_dfi mp_physics_dfi==14 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package wdm6scheme_dfi mp_physics_dfi==16 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package thompson07_dfi mp_physics_dfi==98 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qni

package noprogn progn==0 - -
package progndrop progn==1 - scalar:qndrop
Expand Down
2 changes: 0 additions & 2 deletions Registry/Registry.EM_SST
View file
Expand Up @@ -1846,7 +1846,6 @@ package morr_two_moment mp_physics==10 - moist:qv,qc,q
package sbu_ylinscheme mp_physics==13 - moist:qv,qc,qr,qi,qs;state:rimi
package wdm5scheme mp_physics==14 - moist:qv,qc,qr,qi,qs;scalar:qnn,qnc,qnr
package wdm6scheme mp_physics==16 - moist:qv,qc,qr,qi,qs,qg;scalar:qnn,qnc,qnr
package thompson07 mp_physics==98 - moist:qv,qc,qr,qi,qs,qg;scalar:qni

package nodfimoist mp_physics_dfi==-1 - -
package passiveqv_dfi mp_physics_dfi==0 - dfi_moist:dfi_qv
Expand All @@ -1864,7 +1863,6 @@ package morr_two_moment_dfi mp_physics_dfi==10 - dfi_moist:dfi
package sbu_ylinscheme_dfi mp_physics==13 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs;state:rimi
package wdm5scheme_dfi mp_physics_dfi==14 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package wdm6scheme_dfi mp_physics_dfi==16 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package thompson07_dfi mp_physics_dfi==98 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qni

package noprogn progn==0 - -
package progndrop progn==1 - scalar:qndrop;dfi_scalar:dfi_qndrop
Expand Down
2 changes: 0 additions & 2 deletions Registry/Registry.NMM
View file
Expand Up @@ -1143,7 +1143,6 @@ package morr_two_moment mp_physics==10 - moist:qv,qc,q
package sbu_ylinscheme mp_physics==13 - moist:qv,qc,qr,qi,qs
package wdm5scheme mp_physics==14 - moist:qv,qc,qr,qi,qs;scalar:qnn,qnc,qnr
package wdm6scheme mp_physics==16 - moist:qv,qc,qr,qi,qs,qg;scalar:qnn,qnc,qnr
package thompson07 mp_physics==98 - moist:qv,qc,qr,qi,qs,qg;scalar:qni
package etamp_hwrf mp_physics==85 - moist:qv,qc,qr,qi,qs

package nodfimoist mp_physics_dfi==-1 - -
Expand All @@ -1162,7 +1161,6 @@ package morr_two_moment_dfi mp_physics_dfi==10 - dfi_moist:dfi
package sbu_ylinscheme_dfi mp_physics==13 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs
package wdm5scheme_dfi mp_physics_dfi==14 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package wdm6scheme_dfi mp_physics_dfi==16 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package thompson07_dfi mp_physics_dfi==98 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qni

# package noprogn progn==0 - -
# package progndrop progn==1 - scalar:qndrop;dfi_scalar:dfi_qndrop
Expand Down
1 change: 0 additions & 1 deletion Registry/Registry.NMM_CHEM
View file
Expand Up @@ -1203,7 +1203,6 @@ package morr_two_moment mp_physics==10 - moist:qv,qc,q
package sbu_ylinscheme mp_physics==13 - moist:qv,qc,qr,qi,qs
package wdm5scheme mp_physics==14 - moist:qv,qc,qr,qi,qs;scalar:qnn,qnc,qnr
package wdm6scheme mp_physics==16 - moist:qv,qc,qr,qi,qs,qg;scalar:qnn,qnc,qnr
package thompson07 mp_physics==98 - moist:qv,qc,qr,qi,qs,qg;scalar:qni
package etamp_hwrf mp_physics==85 - moist:qv,qc,qr,qi,qs

package rrtmscheme ra_lw_physics==1 - -
Expand Down
2 changes: 0 additions & 2 deletions Registry/Registry.NMM_NEST
View file
Expand Up @@ -1254,7 +1254,6 @@ package morr_two_moment mp_physics==10 - moist:qv,qc,q
package sbu_ylinscheme mp_physics==13 - moist:qv,qc,qr,qi,qs
package wdm5scheme mp_physics==14 - moist:qv,qc,qr,qi,qs;scalar:qnn,qnc,qnr
package wdm6scheme mp_physics==16 - moist:qv,qc,qr,qi,qs,qg;scalar:qnn,qnc,qnr
package thompson07 mp_physics==98 - moist:qv,qc,qr,qi,qs,qg;scalar:qni
package etamp_hwrf mp_physics==85 - moist:qv,qc,qr,qi,qs

package nodfimoist mp_physics_dfi==-1 - -
Expand All @@ -1272,7 +1271,6 @@ package morr_two_moment_dfi mp_physics_dfi==10 - dfi_moist:dfi
package sbu_ylinscheme_dfi mp_physics==13 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs
package wdm5scheme_dfi mp_physics_dfi==14 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package wdm6scheme_dfi mp_physics_dfi==16 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package thompson07_dfi mp_physics_dfi==98 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qni

# package noprogn progn==0 - -
# package progndrop progn==1 - scalar:qndrop;dfi_scalar:dfi_qndrop
Expand Down
3 changes: 0 additions & 3 deletions Registry/Registry.wrfvar
View file
Expand Up @@ -2174,7 +2174,6 @@ package morr_two_moment mp_physics==10 - moist:qv,qc,q
#package milbrandt3mom mp_physics==12 - moist:qv,qc,qr,qi,qs,qg,qh;scalar:qnc,qnr,qni,qns,qng,qnh,qzr,qzi,qzs,qzg,qzh
package wdm5scheme mp_physics==14 - moist:qv,qc,qr,qi,qs;g_moist:g_qv,g_qc,g_qr,g_qi,g_qs;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs;scalar:qnn,qnc,qnr
package wdm6scheme mp_physics==16 - moist:qv,qc,qr,qi,qs,qg;g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg;scalar:qnn,qnc,qnr
package thompson07 mp_physics==98 - moist:qv,qc,qr,qi,qs,qg;g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg;scalar:qni

package nodfimoist mp_physics_dfi==-1 - -
package passiveqv_dfi mp_physics_dfi==0 - dfi_moist:dfi_qv
Expand All @@ -2191,7 +2190,6 @@ package milbrandt2mom_dfi mp_physics_dfi==9 - dfi_moist:dfi
package morr_two_moment_dfi mp_physics_dfi==10 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qni,dfi_qns,dfi_qnr,dfi_qng
package wdm5scheme_dfi mp_physics_dfi==14 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package wdm6scheme_dfi mp_physics_dfi==16 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qnn,dfi_qnc,dfi_qnr
package thompson07_dfi mp_physics_dfi==98 - dfi_moist:dfi_qv,dfi_qc,dfi_qr,dfi_qi,dfi_qs,dfi_qg;dfi_scalar:dfi_qni

package no4dvarmoist mp_physics_4dvar==-1 - -
package passiveqv_4dvar mp_physics_4dvar==0 - g_moist:g_qv;a_moist:a_qv
Expand All @@ -2208,7 +2206,6 @@ package milbrandt2mom_4dvar mp_physics_4dvar==9 - g_moist:g
package morr_two_moment_4dvar mp_physics_4dvar==10 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg
package wdm5scheme_4dvar mp_physics_4dvar==14 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs
package wdm6scheme_4dvar mp_physics_4dvar==16 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg
package thompson07_4dvar mp_physics_4dvar==98 - g_moist:g_qv,g_qc,g_qr,g_qi,g_qs,g_qg;a_moist:a_qv,a_qc,a_qr,a_qi,a_qs,a_qg


package noprogn progn==0 - -
Expand Down
3 changes: 0 additions & 3 deletions phys/Makefile
View file
Expand Up @@ -54,7 +54,6 @@ MODULES = \
module_mp_etanew.o \
module_mp_HWRF.o \
module_mp_thompson.o \
module_mp_thompson07.o \
module_mp_gsfcgce.o \
module_mp_morr_two_moment.o \
module_mp_milbrandt2mom.o \
Expand Down Expand Up @@ -397,7 +396,6 @@ module_physics_init.o : \
module_fdda_spnudging.o \
module_fddaobs_rtfdda.o \
module_mp_thompson.o \
module_mp_thompson07.o \
module_mp_gsfcgce.o \
module_mp_morr_two_moment.o \
module_mp_milbrandt2mom.o \
Expand All @@ -420,7 +418,6 @@ module_microphysics_driver.o: \
module_mp_wsm6.o module_mp_etanew.o \
module_mp_HWRF.o \
module_mp_thompson.o \
module_mp_thompson07.o \
module_mp_gsfcgce.o \
module_mp_morr_two_moment.o \
module_mp_milbrandt2mom.o \
Expand Down
36 changes: 2 additions & 34 deletions phys/module_microphysics_driver.F
View file
Expand Up @@ -49,13 +49,13 @@ SUBROUTINE microphysics_driver( &
USE module_state_description, ONLY : &
KESSLERSCHEME, LINSCHEME, SBU_YLINSCHEME, WSM3SCHEME, WSM5SCHEME &
,WSM6SCHEME, ETAMPNEW, etamp_HWRF,THOMPSON, MORR_TWO_MOMENT &
,GSFCGCESCHEME, WDM5SCHEME, WDM6SCHEME, THOMPSON07 &
,GSFCGCESCHEME, WDM5SCHEME, WDM6SCHEME &
,MILBRANDT2MOM !,MILBRANDT3MOM
#else
USE module_state_description, ONLY : &
KESSLERSCHEME, LINSCHEME, SBU_YLINSCHEME, WSM3SCHEME, WSM5SCHEME &
,WSM6SCHEME, ETAMPNEW,THOMPSON, MORR_TWO_MOMENT &
,GSFCGCESCHEME, WDM5SCHEME, WDM6SCHEME, THOMPSON07 &
,GSFCGCESCHEME, WDM5SCHEME, WDM6SCHEME &
,MILBRANDT2MOM !,MILBRANDT3MOM
#endif

Expand All @@ -73,7 +73,6 @@ SUBROUTINE microphysics_driver( &
USE module_mp_wsm6
USE module_mp_etanew
USE module_mp_thompson
USE module_mp_thompson07
USE module_mp_gsfcgce
USE module_mp_morr_two_moment
USE module_mp_wdm5
Expand Down Expand Up @@ -988,37 +987,6 @@ SUBROUTINE microphysics_driver( &
CALL wrf_error_fatal ( 'arguments not present for calling etampnew' )
ENDIF

CASE (THOMPSON07)
CALL wrf_debug ( 100 , 'microphysics_driver: calling thompson07 et al' )
IF ( PRESENT( QV_CURR ) .AND. PRESENT ( QC_CURR ) .AND. &
PRESENT( QR_CURR ) .AND. PRESENT ( QI_CURR ) .AND. &
PRESENT( QS_CURR ) .AND. PRESENT ( QG_CURR ) .AND. &
PRESENT ( QNI_CURR ).AND. &
PRESENT( RAINNC ) .AND. PRESENT ( RAINNCV ) ) THEN
CALL mp_gt_driver07( &
QV=qv_curr, &
QC=qc_curr, &
QR=qr_curr, &
QI=qi_curr, &
QS=qs_curr, &
QG=qg_curr, &
NI=qni_curr, &
TH=th, &
PII=pi_phy, &
P=p, &
DZ=dz8w, &
DT_IN=dt, &
ITIMESTEP=itimestep, &
RAINNC=RAINNC, &
RAINNCV=RAINNCV, &
SR=SR &
,IDS=ids,IDE=ide, JDS=jds,JDE=jde, KDS=kds,KDE=kde &
,IMS=ims,IME=ime, JMS=jms,JME=jme, KMS=kms,KME=kme &
,ITS=its,ITE=ite, JTS=jts,JTE=jte, KTS=kts,KTE=kte)
ELSE
CALL wrf_error_fatal ( 'arguments not present for calling thompson07' )
ENDIF

CASE DEFAULT

WRITE( wrf_err_message , * ) 'The microphysics option does not exist: mp_physics = ', mp_physics
Expand Down

0 comments on commit 8370f6f

Please sign in to comment.