Shared physics YSU PBL

arch/postamble

@@ -203,6 +203,13 @@ wrfio_esmf :
         fi
 	$(FC) -o $@ -c $(FCFLAGS) $(OMP) $(MODULE_DIRS) $(PROMOTION) $(FCSUFFIX) $*.f90
 
+.F90.o:
+	$(RM) $@
+	sed -e "s/^\!.*'.*//" -e "s/^ *\!.*'.*//" $*.F90 > $*.G
+	$(CPP) -I$(WRF_SRC_ROOT_DIR)/inc $(CPPFLAGS) $(OMPCPP) $*.G  > $*.bb
+	$(SED_FTN) $*.bb | $(CPP) $(TRADFLAG) > $*.f90
+	$(RM) $*.G $*.bb
+	$(FC) -o $@ -c $(FCFLAGS) $(OMP) $(MODULE_DIRS) $(PROMOTION) $(FCSUFFIX) $*.f90
 
 .F.f90:
 	$(RM) $@
@@ -211,6 +218,13 @@ wrfio_esmf :
 	$(CPP) -I$(WRF_SRC_ROOT_DIR)/inc $(CPPFLAGS) $*.H  > $@
 	$(RM) $*.G $*.H
 
+.F90.f90:
+	$(RM) $@
+	sed -e "s/^\!.*'.*//" -e "s/^ *\!.*'.*//" $*.F90 > $*.G
+	$(SED_FTN) $*.G > $*.H
+	$(CPP) -I$(WRF_SRC_ROOT_DIR)/inc $(CPPFLAGS) $*.H  > $@
+	$(RM) $*.G $*.H
+
 .f90.o:
 	$(RM) $@
 	$(FC) -o $@ -c $(FCFLAGS) $(PROMOTION) $(FCSUFFIX) $*.f90

arch/preamble

@@ -17,7 +17,7 @@
 SHELL           =       /bin/sh
 DEVTOP          =       `pwd`
 LIBINCLUDE      =       .
-.SUFFIXES: .F .i .o .f90 .c
+.SUFFIXES: .F .i .o .f90 .c .F90
 
 #### Get core settings from environment (set in compile script)
 #### Note to add a core, this has to be added to.

clean

@@ -3,12 +3,12 @@
 set nonomatch
 
 
-foreach dir ( frame chem share dyn_em phys cmaq main tools wrftladj )
+foreach dir ( frame chem share dyn_em phys phys/physics_mmm cmaq main tools wrftladj )
   if ( -d $dir ) then
      if ( $dir == cmaq ) then
         ( cd $dir ; echo $dir ; /bin/rm -f *.o *.mod ) >& /dev/null
      else
-        ( cd $dir ; echo $dir ; /bin/rm -f core wrf *.f90 *.exe *.kmo *.mod *.o *.obj *.inc *.F90 *.a \
+        ( cd $dir ; echo $dir ; /bin/rm -f core wrf *.f90 *.exe *.kmo *.mod *.o *.obj *.inc *.a \
                       db_* Warnings module_state_description.F module_dm.F gmeta \
                       wrfdata whatiread rsl.* show_domain* ) >& /dev/null
      endif

main/depend.common

@@ -278,6 +278,11 @@ module_madwrf.o: \
 	module_mp_thompson.o 
 
 
+module_bl_ysu.o: \
+	ccpp_kind_types.o \
+	physics_mmm/bl_ysu.o
+
+
 module_bl_myjpbl.o: \
 	../share/module_model_constants.o 
 
@@ -1477,6 +1482,10 @@ module_mp_gsfcgce_4ice_nuwrf.o: \
 	module_checkerror.o \
 	module_mp_radar.o \
 
+
+physics_mmm/bl_ysu.o: \
+	ccpp_kind_types.o
+
 # End of DEPENDENCIES for phys
 
 

phys/Makefile

@@ -233,19 +233,22 @@ DIAGNOSTIC_MODULES_EM = \
 	module_diag_trad_fields.o \
         module_diag_solar.o
 
+PHYSMMM_MODULES = \
+	./physics_mmm/bl_ysu.o
 OBJS    =
 
 LIBTARGET    =  physics
 TARGETDIR    =  ./
 
 $(LIBTARGET) :
-	$(MAKE) $(J) non_nmm ; \
+	$(MAKE) $(J) non_nmm shared_phys ; \
 	$(AR) $(ARFLAGS) ../main/$(LIBWRFLIB) $(MODULES) $(OBJS)  \
-		$(FIRE_MODULES) $(DIAGNOSTIC_MODULES_EM)
+		$(FIRE_MODULES) $(DIAGNOSTIC_MODULES_EM) $(PHYSMMM_MODULES)
 
 include ../configure.wrf
 
-non_nmm : $(MODULES) $(FIRE_MODULES) $(WIND_MODULES) $(OBJS) $(DIAGNOSTIC_MODULES_EM)
+non_nmm : $(MODULES) $(FIRE_MODULES) $(OBJS) $(DIAGNOSTIC_MODULES_EM)
+shared_phys: $(PHYSMMM_MODULES)
 
 submodules :
 	@if [ \( ! -f module_sf_noahmpdrv.F \) -o \( ! -f module_sf_noahmp_glacier.F \) -o \

phys/module_pbl_driver.F

@@ -838,6 +838,10 @@ SUBROUTINE pbl_driver(                                          &
 !
 ! END FASDAS
 !
+! To accommodate shared physics
+   character*256 :: errmsg
+   integer :: errflg
+!
 !------------------------------------------------------------------
 !
 !!!!!!!if using BEP set flag_bep to true
@@ -1202,13 +1206,13 @@ SUBROUTINE pbl_driver(                                          &
                 PRESENT( hol      ) ) THEN
 !
              CALL ysu(                                              &
-               U3D=u_phytmp,V3D=v_phytmp,TH3D=th_phy,T3D=t_phy      &
+               U3D=u_phytmp,V3D=v_phytmp,T3D=t_phy                  &
               ,QV3D=qv_curr,QC3D=qc_curr,QI3D=qi_curr               &
               ,P3D=p_phy,P3DI=p8w,PI3D=pi_phy                       &
               ,RUBLTEN=rublten,RVBLTEN=rvblten                      &
               ,RTHBLTEN=rthblten,RQVBLTEN=rqvblten                  &
               ,RQCBLTEN=rqcblten,RQIBLTEN=rqiblten                  &
-              ,FLAG_QI=flag_qi                                      &
+              ,FLAG_QI=flag_qi,FLAG_QC=flag_qc                      &
               ,CP=cp,G=g,ROVCP=rcp,RD=r_D,ROVG=rovg                 &
               ,DZ8W=dz8w,XLV=XLV,RV=r_v,PSFC=PSFC                   &
               ,ZNT=znt,UST=ust,HPBL=pblh                            &
@@ -1221,7 +1225,7 @@ SUBROUTINE pbl_driver(                                          &
               ,YSU_TOPDOWN_PBLMIX=ysu_topdown_pblmix                &
               ,WSPD=wspd,BR=br,DT=dtbl,KPBL2D=kpbl                  &
               ,EP1=ep_1,EP2=ep_2,KARMAN=karman                      &
-              ,EXCH_H=exch_h,EXCH_M=exch_m,REGIME=regime            &
+              ,EXCH_H=exch_h,EXCH_M=exch_m                          &
               ,RTHRATEN=RTHRATEN                                    &
 ! for multilayer UCM
               ,IDIFF=idiff,FLAG_BEP=flag_bep,FRC_URB2D=frc_urb2d    &
@@ -1233,6 +1237,7 @@ SUBROUTINE pbl_driver(                                          &
               ,DL_U_BEP=dl_u_bep,SF_BEP=sf_bep,VL_BEP=vl_bep        &
 ! for grims shallow convection with ysupbl
               ,WSTAR=wstar,DELTA=delta                              &
+              ,errmsg=errmsg,errflg=errflg                          &
               ,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      &

phys/module_physics_init.F

@@ -3690,14 +3690,6 @@ SUBROUTINE bl_init(STEPBL,BLDT,DT,RUBLTEN,RVBLTEN,RTHBLTEN,  &
       CASE (YSUSCHEME)
            if(isfc .ne. 1)CALL wrf_error_fatal &
             ( 'module_physics_init: Use sf_sfclay_physics= 1 or 91 for this pbl option' )
-           CALL ysuinit(RUBLTEN,RVBLTEN,RTHBLTEN,RQVBLTEN,    &
-                        RQCBLTEN,RQIBLTEN,P_QI,               &
-                        PARAM_FIRST_SCALAR,                   &
-                        restart,                              &
-                        allowed_to_read ,                     &
-                        ids, ide, jds, jde, kds, kde,         &
-                        ims, ime, jms, jme, kms, kme,         &
-                        its, ite, jts, jte, kts, kte          )
       CASE (SHINHONGSCHEME)
            if(isfc .ne. 1)CALL wrf_error_fatal &
             ( 'module_physics_init: Use sf_sfclay_physics= 1 or 91 for this pbl option' )