add support for Global DA version 2

KathyNie · Nov 15, 2023 · d927928 · d927928
1 parent d44d7fd
commit d927928
Show file tree

Hide file tree

Showing 16 changed files with 1,416 additions and 15 deletions.
diff --git a/lis/configs/lis.config.adoc b/lis/configs/lis.config.adoc
@@ -1246,6 +1246,7 @@ Acceptable values are:
 |"`USAFSI`"                     | USAF Snow and Ice Analysis
 |"`SMAP(NASA) vegetation optical depth`"  | NASA L-band vegetation optical depth 
 |"`MCD15A2H LAI`"               | MODIS MCD15A2H v006 LAI product
+|"`MCD15A3H LAI`"               | MODIS MCD15A3H v061 LAI product
 |"`SMOS NRT NN soil moisture`"  | SMOS Level 2 Soil Moisture Near Real Time Neural Network
 |"`THySM`"                      | Thermal Hydraulic disaggregation of Soil Moisture
 |"`SNODAS`"                     | SNODAS snow depth
@@ -2829,6 +2830,28 @@ MCD15A2H LAI apply climatological fill values:                1
 MCD15A2H LAI apply QC flags:                                  1
 ....
 
+[[sssec_mcd15a3hlaida,MODIS MCD15A3H LAI assimilation]]
+==== MODIS MCD15A3H LAI assimilation
+
+`MCD15A3H LAI data directory:` specifies the location of the data directory containing the MODIS MCD15A3H LAI retrievals.          
+
+`MCD15A3H LAI data version:` specifies the version of the MCD15A3H LAI retrievals. The default version is "061".                   
+
+`MCD15A3H LAI apply temporal smoother between 4-day intervals:` specifies whether to apply temporal smoother between 4-day intervals of the LAI product
+
+`MCD15A3H LAI apply climatological fill values:` specifies whether to fill in climatological LAI values if there are missing values. 
+
+`MCD15A3H LAI apply QC flags:` specifies whether to apply quality control flags for LAI retrievals.
+
+.Example _lis.config_ entry     
+....
+MCD15A3H LAI data directory:                                  ./MCD15A3H.061
+MCD15A3H LAI data version:                                    "061"
+MCD15A3H LAI apply temporal smoother between 4-day intervals: 1
+MCD15A3H LAI apply climatological fill values:                1
+MCD15A3H LAI apply QC flags:                                  1
+....
+
 [[sssec_simgraceda,Simulated GRACE]]
 ==== Simulated GRACE
 

diff --git a/lis/dataassim/obs/ESACCI_sm/read_ESACCIsm.F90 b/lis/dataassim/obs/ESACCI_sm/read_ESACCIsm.F90
@@ -179,18 +179,36 @@ subroutine read_ESACCIsm(n,k,  OBS_State, OBS_Pert_State)
 !-------------------------------------------------------------------------
 !  Transform data to the LSM climatology using a CDF-scaling approach
 !-------------------------------------------------------------------------     
-  if(LIS_rc%dascaloption(k).ne."none".and.fnd.ne.0) then  
+  if(LIS_rc%dascaloption(k).eq."CDF matching".and.fnd.ne.0) then
      call LIS_rescale_with_CDF_matching(    &
-          n,k,                              & 
-          ESACCI_sm_struc(n)%nbins,         & 
-          ESACCI_sm_struc(n)%ntimes,        & 
-          MAX_SM_VALUE,                     & 
-          MIN_SM_VALUE,                     & 
+          n,k,                              &
+          ESACCI_sm_struc(n)%nbins,         &
+          ESACCI_sm_struc(n)%ntimes,        &
+          MAX_SM_VALUE,                     &
+          MIN_SM_VALUE,                     &
           ESACCI_sm_struc(n)%model_xrange,  &
           ESACCI_sm_struc(n)%obs_xrange,    &
           ESACCI_sm_struc(n)%model_cdf,     &
           ESACCI_sm_struc(n)%obs_cdf,       &
           sm_current)
+  elseif(LIS_rc%dascaloption(k).eq."Linear scaling".and.fnd.ne.0) then
+     call LIS_rescale_with_linear_scaling(    &
+          n,                              &
+          k,                              &
+          ESACCI_sm_struc(n)%nbins,         &
+          ESACCI_sm_struc(n)%ntimes,        &
+          ESACCI_sm_struc(n)%obs_xrange,    &
+          ESACCI_sm_struc(n)%obs_cdf,       &
+          sm_current)
+  elseif(LIS_rc%dascaloption(k).eq."Anomaly scaling".and.fnd.ne.0) then
+     call LIS_rescale_with_anomaly(    &
+          n,                              &
+          k,                              &
+          ESACCI_sm_struc(n)%nbins,         &
+          ESACCI_sm_struc(n)%ntimes,        &
+          ESACCI_sm_struc(n)%obs_mu,    &
+          ESACCI_sm_struc(n)%model_mu,       &
+          sm_current)
   endif
 
   obsl = LIS_rc%udef