Skip to content

Updating MYNN-SFC #2290

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
islas merged 5 commits into from
Mar 18, 2026
+25 −12
Merged

Updating MYNN-SFC #2290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2973d9
Updating pointer to MYNN-SFC
joeolson42 Mar 3, 2026
e83780b
updating associated changes to the surface driver
joeolson42 Mar 3, 2026
fc37c2e
bug fix for depend.common
joeolson42 Mar 4, 2026
fd3e3de
bug fix for uninitialilzed psiq10 and some cleanup
joeolson42 Mar 9, 2026
4785f36
Update depend.common
weiwangncar Mar 18, 2026
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
2 changes: 1 addition & 1 deletion phys/MYNN-SFC
Open in desktop
Submodule MYNN-SFC updated 24 files
+8 −0 .github/workflows/run_test.yml
+48 −0 MPAS/Makefile
+48 −0 MPAS/Makefile_debug
+78 −0 MPAS/module_sf_mynnsfc_common.F90
+892 −0 MPAS/module_sf_mynnsfc_driver.F90
+63 −35 WRF/module_sf_mynnsfc_driver.F90
+196 −167 module_sf_mynnsfc_ice.F90
+155 −134 module_sf_mynnsfc_land.F90
+140 −85 module_sf_mynnsfc_water.F90
+7 −6 tests/Makefile
+23 −0 tests/README.md
+8 −0 tests/ccpp_kind_types.F90
+146 −146 tests/data/ccpp_output_lnd.txt
+49 −0 tests/data/input_icy.txt
+49 −0 tests/data/input_lnd.txt
+49 −0 tests/data/input_wat.txt
+49 −0 tests/data/output_icy.txt
+49 −0 tests/data/output_lnd.txt
+49 −0 tests/data/output_wat.txt
+19 −2 tests/driver.F90
+180 −0 tests/module_model_constants.F90
+28 −21 tests/module_sf_mynnsfc_ccpp_tests.F90
+328 −0 tests/module_sf_mynnsfc_wrf_tests.F90
+9 −0 tests/module_state_description.F90
35 changes: 24 additions & 11 deletions phys/module_surface_driver.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2422,14 +2422,14 @@ SUBROUTINE surface_driver( &
p3d=p_phy,dz8w=dz8w,th3d=th_phy,rho=rho, &
psfc=psfc,chs=chs,chs2=chs2,cqs=cqs,cqs2=cqs2,cpm=cpm,&
znt=znt,ust=ust,pblh=pblh,mavail=mavail,zol=zol, &
mol=mol,psim=psim,psih=psih, &
mol=mol,psim=psim,psih=psih,qgh=qgh, &
xland=xland,hfx=hfx,qfx=qfx,lh=lh,tsk=tsk, &
flhc=flhc,flqc=flqc,qsfc=qsfc,rmol=rmol, &
u10=u10,v10=v10,th2=th2,t2=t2,q2=q2,snowh=snowh, &
gz1oz0=gz1oz0,wspd=wspd,br=br,dx=dx2d, &
itimestep=itimestep,ch=ch, &
spp_pbl=spp_pbl,pattern_spp_pbl=pattern_spp_pbl, &
xice=XICE,sst=SST,tsk_sea=TSK_SEA, &
xice=XICE,sst=SST,tsk_sea=TSK_SEA,qgh_sea=QGH_SEA, &
chs2_sea=CHS2_SEA,chs_sea=CHS_SEA,cpm_sea=CPM_SEA, &
cqs2_sea=CQS2_SEA,flhc_sea=FLHC_SEA, &
flqc_sea=FLQC_SEA,hfx_sea=HFX_SEA,lh_sea=LH_SEA, &
Expand All @@ -2443,7 +2443,8 @@ SUBROUTINE surface_driver( &
ustm=ustm,ck=ck,cka=cka,cd=cd,cda=cda, &
sf_mynn_sfcflux_land=sf_mynn_sfcflux_land, &
sf_mynn_sfcflux_water=sf_mynn_sfcflux_water, &
isfflx=isfflx, &
isfflx=isfflx,shalwater_z0=shalwater_z0, &
water_depth=water_depth,lakemask=lakemask, &
flag_lsm=sf_surface_physics,restart=restart_flag, &
errmsg=errmsg,errflg=errflg )
ELSE
Expand All @@ -2452,7 +2453,7 @@ SUBROUTINE surface_driver( &
rho3d=rho,psfcpa=psfc, &
chs=chs,chs2=chs2,cqs=cqs,cqs2=cqs2,cpm=cpm, &
znt=znt,ust=ust,pblh=pblh,mavail=mavail,zol=zol, &
mol=mol,psim=psim,psih=psih, &
mol=mol,psim=psim,psih=psih,qgh=qgh, &
xland=xland,hfx=hfx,qfx=qfx,lh=lh,tsk=tsk, &
flhc=flhc,flqc=flqc,qsfc=qsfc,rmol=rmol, &
u10=u10,v10=v10,th2=th2,t2=t2,q2=q2,snowh=snowh, &
Expand All @@ -2466,7 +2467,8 @@ SUBROUTINE surface_driver( &
ustm=ustm,ck=ck,cka=cka,cd=cd,cda=cda, &
sf_mynn_sfcflux_land=sf_mynn_sfcflux_land, &
sf_mynn_sfcflux_water=sf_mynn_sfcflux_water, &
isfflx=isfflx, &
isfflx=isfflx,shalwater_z0=shalwater_z0, &
water_depth=water_depth,lakemask=lakemask, &
flag_lsm=sf_surface_physics,restart=restart_flag, &
errmsg=errmsg,errflg=errflg )
ENDIF
Expand Down Expand Up @@ -5348,12 +5350,12 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
P3D,dz8w,th3d,rho, &
PSFC,CHS,CHS2,CQS,CQS2,CPM, &
ZNT,UST,PBLH,MAVAIL,ZOL,MOL,PSIM,PSIH, &
XLAND,HFX,QFX,LH,TSK,FLHC,FLQC,QSFC,RMOL, &
XLAND,HFX,QFX,LH,TSK,FLHC,FLQC,QSFC,RMOL,QGH, &
U10,V10,TH2,T2,Q2,SNOWH, &
GZ1OZ0,WSPD,BR,ISFFLX,DX, &
&itimestep,ch, &
&spp_pbl,pattern_spp_pbl, &
XICE,SST,TSK_SEA, &
XICE,SST,TSK_SEA,QGH_SEA, &
CHS2_SEA,CHS_SEA,CPM_SEA,CQS2_SEA,FLHC_SEA,FLQC_SEA, &
HFX_SEA,LH_SEA,QFX_SEA,QSFC_SEA,ZNT_SEA, &
TICE2TSK_IF2COLD,XICE_THRESHOLD, &
Expand All @@ -5362,6 +5364,7 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
its,ite, jts,jte, kts,kte, &
ustm,ck,cka,cd,cda,sf_mynn_sfcflux_land, &
sf_mynn_sfcflux_water,flag_lsm,restart, &
shalwater_z0,water_depth,lakemask, &
errmsg,errflg )

USE module_sf_mynnsfc_driver
Expand All @@ -5378,7 +5381,8 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
INTEGER, INTENT(IN ) :: itimestep, ISFFLX
INTEGER, INTENT(IN ), optional :: sf_mynn_sfcflux_land, &
sf_mynn_sfcflux_water, &
flag_lsm
flag_lsm, &
shalwater_z0
LOGICAL, INTENT(IN) :: restart
INTEGER, INTENT(IN), optional :: spp_pbl
REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), &
Expand All @@ -5396,6 +5400,8 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
REAL, DIMENSION( ims:ime, jms:jme ) , &
INTENT(IN ) :: MAVAIL, &
XLAND, &
water_depth, &
lakemask, &
PSFC, &
SNOWH, &
TSK, &
Expand All @@ -5415,6 +5421,7 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
LH, &
MOL,RMOL, &
QSFC, &
QGH, &
ZNT, &
ZOL, &
UST, &
Expand Down Expand Up @@ -5451,6 +5458,7 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
HFX_SEA, &
LH_SEA, &
QFX_SEA, &
QGH_SEA, &
QSFC_SEA, &
ZNT_SEA

Expand All @@ -5472,6 +5480,7 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
PSIH_SEA, PSIH_HOLD, &
PSIM_SEA, PSIM_HOLD, &
QFX_HOLD, &
QGH_HOLD, &
CPM_HOLD, &
RMOL_SEA, RMOL_HOLD, &
UST_SEA, UST_HOLD, &
Expand Down Expand Up @@ -5516,6 +5525,7 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
PSIH_HOLD(its:ite,jts:jte) = PSIH(its:ite,jts:jte)
PSIM_HOLD(its:ite,jts:jte) = PSIM(its:ite,jts:jte)
QFX_HOLD(its:ite,jts:jte) = QFX(its:ite,jts:jte)
QGH_HOLD(its:ite,jts:jte) = QGH(its:ite,jts:jte)
RMOL_HOLD(its:ite,jts:jte) = RMOL(its:ite,jts:jte)
UST_HOLD(its:ite,jts:jte) = UST(its:ite,jts:jte)
USTM_HOLD(its:ite,jts:jte) = USTM(its:ite,jts:jte)
Expand All @@ -5532,7 +5542,7 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
rho3d=rho,psfcpa=psfc, &
chs=chs,chs2=chs2,cqs=cqs,cqs2=cqs2,cpm=cpm, &
znt=znt,ust=ust,pblh=pblh,mavail=mavail,zol=zol,&
mol=mol,psim=psim,psih=psih, &
mol=mol,psim=psim,psih=psih,qgh=qgh, &
xland=xland,hfx=hfx,qfx=qfx,lh=lh,tsk=tsk_local,&
flhc=flhc,flqc=flqc,qsfc=qsfc,rmol=rmol, &
u10=u10,v10=v10,th2=th2,t2=t2,q2=q2,snowh=snowh,&
Expand All @@ -5545,7 +5555,8 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
ustm=ustm,ck=ck,cka=cka,cd=cd,cda=cda, &
sf_mynn_sfcflux_land=sf_mynn_sfcflux_land, &
sf_mynn_sfcflux_water=sf_mynn_sfcflux_water, &
isfflx=isfflx, &
isfflx=isfflx,shalwater_z0=shalwater_z0, &
water_depth=water_depth,lakemask=lakemask, &
flag_lsm=flag_lsm,restart=restart, &
errmsg=errmsg,errflg=errflg )

Expand Down Expand Up @@ -5585,6 +5596,7 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
PSIH_SEA(its:ite,jts:jte) = PSIH_HOLD(its:ite,jts:jte)
PSIM_SEA(its:ite,jts:jte) = PSIM_HOLD(its:ite,jts:jte)
QFX_SEA(its:ite,jts:jte) = QFX_HOLD(its:ite,jts:jte)
QGH_SEA(its:ite,jts:jte) = QGH_HOLD(its:ite,jts:jte)
RMOL_SEA(its:ite,jts:jte) = RMOL_HOLD(its:ite,jts:jte)
UST_SEA(its:ite,jts:jte) = UST_HOLD(its:ite,jts:jte)
USTM_SEA(its:ite,jts:jte) = USTM_HOLD(its:ite,jts:jte)
Expand All @@ -5597,7 +5609,7 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
qv3d=qv3d,p3d=p3d,dz8w=dz8w,th3d=th3d,rho3d=rho,psfcpa=psfc, &
chs=chs_sea,chs2=chs2_sea,cqs=cqs,cqs2=cqs2_sea,cpm=cpm_sea, &
znt=znt_sea,ust=ust_sea,pblh=pblh,mavail=mavail_sea,zol=zol_sea, &
mol=mol_sea,psim=psim_sea,psih=psih_sea, &
mol=mol_sea,psim=psim_sea,psih=psih_sea,qgh=qgh_sea, &
xland=xland_sea,hfx=hfx_sea,qfx=qfx_sea,lh=lh_sea,tsk=tsk_sea, &
flhc=flhc_sea,flqc=flqc_sea,qsfc=qsfc_sea,rmol=rmol_sea, &
u10=u10_sea,v10=v10_sea,th2=th2_sea,t2=t2_sea,q2=q2_sea,snowh=snowh,&
Expand Down Expand Up @@ -5631,6 +5643,7 @@ SUBROUTINE mynn_seaice_wrapper(U3D,V3D,T3D,QV3D, &
psih(i,j) = psih(i,j) * XICE(i,j) + (1.0-XICE(i,j)) * psih_sea(i,j)
psim(i,j) = psim(i,j) * XICE(i,j) + (1.0-XICE(i,j)) * psim_sea(i,j)
! QFX -- wait
! QGH -- wait
rmol(i,j) = rmol(i,j) * XICE(i,j) + (1.0-XICE(i,j)) * rmol_sea(i,j)
ust(i,j) = ust(i,j) * XICE(i,j) + (1.0-XICE(i,j)) * ust_sea(i,j)
wspd(i,j) = wspd(i,j) * XICE(i,j) + (1.0-XICE(i,j)) * wspd_sea(i,j)
Expand Down