LIS/Noah-MPv5.0 coupling

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "lis/surfacemodels/land/noahmp.5.0/phys/noahmp"]
+	path = lis/surfacemodels/land/noahmp.5.0/phys/noahmp
+	url = https://github.com/NCAR/noahmp
+        branch = release-v5.0-LIS 

lis/make/default.cfg

@@ -1196,6 +1196,31 @@ virtual_optue path: surfacemodels/land/noahmp.4.0.1/pe,
 virtual_routing path: surfacemodels/land/noahmp.4.0.1/routing
 virtual_irrigation path: surfacemodels/land/noahmp.4.0.1/irrigation
 
+[NoahMP.5.0]
+enabled: True
+macro: SM_NOAHMP_5_0
+path: surfacemodels/land/noahmp.5.0,
+      surfacemodels/land/noahmp.5.0/phys/noahmp/drivers/lis,
+      surfacemodels/land/noahmp.5.0/phys/noahmp/src,
+      surfacemodels/land/noahmp.5.0/phys/noahmp/utility,
+      surfacemodels/land/noahmp.5.0/cplsubLSM
+dependent_comps: WRF coupling,
+                 virtual_da,
+                 virtual_optue,
+                 virtual_routing,
+                 virtual_irrigation
+WRF coupling path: surfacemodels/land/noahmp.5.0/cpl_wrf_noesmf
+virtual_da path: surfacemodels/land/noahmp.5.0/da_soilm,
+                 surfacemodels/land/noahmp.5.0/da_snow,
+                 surfacemodels/land/noahmp.5.0/da_LAI,
+                 surfacemodels/land/noahmp.5.0/da_tws,
+                 surfacemodels/land/noahmp.5.0/da_snodep,
+                 surfacemodels/land/noahmp.5.0/da_usafsi
+virtual_optue path: surfacemodels/land/noahmp.5.0/pe,
+            surfacemodels/land/noahmp.5.0/pe/obspred/UAsnow
+virtual_routing path: surfacemodels/land/noahmp.5.0/routing
+virtual_irrigation path: surfacemodels/land/noahmp.5.0/irrigation
+
 [RUC.3.7]
 enabled: True
 macro: SM_RUC_3_7

lis/plugins/LIS_lsm_pluginMod.F90

@@ -151,6 +151,10 @@ subroutine LIS_lsm_plugin
    use NoahMP401_lsmMod, only : noahmp401_ini
 #endif
 
+#if ( defined SM_NOAHMP_5_0 )
+   use NoahMP50_lsmMod, only : noahmp50_ini
+#endif
+
 #if ( defined SM_RUC_3_7 )
    use RUC37_lsmMod, only : ruc37_ini
 #endif
@@ -385,6 +389,17 @@ subroutine LIS_lsm_plugin
    external noahmp401_reset
 #endif
 
+#if ( defined SM_NOAHMP_5_0 )
+   external noahmp50_main
+   external noahmp50_setup
+   external noahmp50_readrst
+   external noahmp50_dynsetup
+   external noahmp50_f2t
+   external noahmp50_writerst
+   external noahmp50_finalize
+   external noahmp50_reset
+#endif
+
 #if ( defined SM_RUC_3_7 )
    external ruc37_main
    external ruc37_setup
@@ -730,6 +745,23 @@ subroutine LIS_lsm_plugin
    call registerlsmreset(trim(LIS_noahmp401Id)//char(0),noahmp401_reset)
 #endif
 
+#if ( defined SM_NOAHMP_5_0 )
+   call registerlsminit(trim(LIS_noahmp50Id)//char(0),noahmp50_ini)
+   call registerlsmsetup(trim(LIS_noahmp50Id)//char(0),noahmp50_setup)
+   call registerlsmf2t(trim(LIS_noahmp50Id)//"+"&
+        //trim(LIS_retroId)//char(0),noahmp50_f2t)
+   call registerlsmf2t(trim(LIS_noahmp50Id)//"+"//&
+        trim(LIS_agrmetrunId)//char(0),noahmp50_f2t)
+   call registerlsmf2t(trim(LIS_noahmp50Id)//"+"//&
+        trim(LIS_smootherDAId)//char(0),noahmp50_f2t)
+   call registerlsmrun(trim(LIS_noahmp50Id)//char(0),noahmp50_main)
+   call registerlsmrestart(trim(LIS_noahmp50Id)//char(0),noahmp50_readrst)
+   call registerlsmdynsetup(trim(LIS_noahmp50Id)//char(0),noahmp50_dynsetup)
+   call registerlsmwrst(trim(LIS_noahmp50Id)//char(0),noahmp50_writerst)
+   call registerlsmfinalize(trim(LIS_noahmp50Id)//char(0),noahmp50_finalize)
+   call registerlsmreset(trim(LIS_noahmp50Id)//char(0),noahmp50_reset)
+#endif
+
 #if ( defined SM_RUC_3_7 )
    call registerlsminit(trim(LIS_ruc37Id)//char(0),ruc37_ini)
    call registerlsmsetup(trim(LIS_ruc37Id)//char(0),ruc37_setup)

lis/plugins/LIS_lsmcpl_pluginMod.F90

@@ -109,6 +109,10 @@ subroutine LIS_lsmcpl_plugin
    external noahMP401_setwrfexport
 #endif
 
+#if ( defined SM_NOAHMP_5_0 )
+   external noahmp50_setwrfexport
+#endif
+
 #if 0
 !tight coupling interfaces: no ESMF
    external noah271_wrf_f2t
@@ -242,6 +246,18 @@ subroutine LIS_lsmcpl_plugin
                                  noahMP401_setwrfexport)
 #endif
 
+#if ( defined SM_NOAHMP_5_0 )
+   call registerlsmcplsetexport(trim(LIS_noahmp50Id)//"+"//&
+                                 trim(LIS_wrfcplId)//char(0), &
+                                 noahmp50_setwrfexport)
+    call registerlsmcplsetexport(trim(LIS_noahmp50Id)//"+"//&
+                                 trim(LIS_nuopccplId)//char(0), &
+                                 noahmp50_setwrfexport)
+    call registerlsmcplsetexport(trim(LIS_noahmp50Id)//"+"//&
+                                 trim(LIS_retroId)//char(0), &
+                                 noahmp50_setwrfexport)
+#endif
+
 #if ( defined SM_NOAH_3_6 )
     call registerlsmf2t(trim(LIS_noah36Id)//"+"//&
                         trim(LIS_wrfcplId)//char(0), &