Merge branch 'support/lisf-public-7.5'

NASA-LIS · Nov 26, 2024 · e4d7524 · e4d7524
2 parents 12d02d2 + 06716e5
commit e4d7524
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/lis/core/LIS_historyMod.F90 b/lis/core/LIS_historyMod.F90
@@ -66,6 +66,8 @@ module LIS_historyMod
 !                   used in GRIB1 & GRIB2 format
 !  18 Oct 2018: David Mocko: Check lis.config entry for option to turn off
 !                   writing ASCII stats files with netCDF output format
+!  25 Oct 2024: Mahdi Navari: updated the code to fix the bug in writing
+!                    model output in 2D ensemble grid space (see https://github.com/NASA-LIS/LISF/issues/1627 )
 !
 ! !USES: 
   use LIS_coreMod
@@ -3440,16 +3442,16 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields)
                 ! lat/lon field output will write in 1D 
                 if(LIS_rc%nlatlon_dimensions == '1D') then
                    if(nmodel_status.eq.1) then
-                      call LIS_verify(nf90_def_var(ftn,trim(short_name),&
+                      call LIS_verify(nf90_def_var(ftn,trim(dataEntry%short_name),&
                            nf90_float,&
                            dimids = dimID(2), varID=dataEntry%varId_def),&
-                           'nf90_def_var for '//trim(short_name)//&
+                           'nf90_def_var for '//trim(dataEntry%short_name)//&
                            'failed in defineNETCDFheadervar')                     
                    elseif(nmodel_status.eq.2) then
-                      call LIS_verify(nf90_def_var(ftn,trim(short_name),&
+                      call LIS_verify(nf90_def_var(ftn,trim(dataEntry%short_name),&
                            nf90_float,&
                            dimids = dimID(1), varID=dataEntry%varId_def),&
-                           'nf90_def_var for '//trim(short_name)//&
+                           'nf90_def_var for '//trim(dataEntry%short_name)//&
                            'failed in defineNETCDFheadervar')                     
                    else                
                       call LIS_verify(nf90_def_var(ftn,trim(dataEntry%short_name)//'_tavg',&
@@ -3460,10 +3462,10 @@ subroutine defineNETCDFheaderVar(n,ftn,dimID, dataEntry, non_model_fields)
                    endif
                 ! latlon field output will write in 2D
                 else
-                     call LIS_verify(nf90_def_var(ftn,trim(short_name),&
+                     call LIS_verify(nf90_def_var(ftn,trim(dataEntry%short_name),&
                          nf90_float,&
                          dimids = dimID(1:2), varID=dataEntry%varID_def),&
-                         'nf90_def_var for '//trim(short_name)//&
+                         'nf90_def_var for '//trim(dataEntry%short_name)//&
                          'failed in defineNETCDFheadervar')
                 endif 
 

diff --git a/lis/surfacemodels/land/noahmp.4.0.1/irrigation/noahmp401_getirrigationstates.F90 b/lis/surfacemodels/land/noahmp.4.0.1/irrigation/noahmp401_getirrigationstates.F90
@@ -212,7 +212,7 @@ subroutine noahmp401_getirrigationstates(n,irrigState)
 
         t=(i-1)*LIS_rc%nensem(n)+m
 
-     timestep = NOAHMP401_struc(n)%dt
+     timestep = NOAHMP401_struc(n)%ts
      soiltyp = noahmp401_struc(n)%noahmp401(t)%soiltype