Merge develop into main in prep for release v3.1.0

CHANGELOG.md

@@ -21,6 +21,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -----------------------------
 
+## [v3.1.0] - 2025-06-26
+
+- 0-diff vs. v3.0.0.
+
+### Added
+
+- Added python package for post-processing ObsFcstAna output into data assimilation diagnostics ([PR #87](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/87), [PR #111](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/111)). 
+- Support for 2d output from EASE tile space and 2d output on EASE grid: 
+  - Switched EASE grid handling to new MAPL EASE Grid Factory ([PR #115](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/115)).
+  - Revised pre-processing of HISTORY template ([PR #118](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/118)).
+- Support for tile space of stretched cube-sphere grids ([PR #109](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/109)).
+
+### Changed
+
+- Revised experiment setup for coupled land-atm DAS ([PR #102](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/102)).
+- Updated defaults in LDASsa_DEFAULT_inputs_*.nml files ([PR #104](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/104)).
+- Added optional SLURM "constraint" ([PR #112](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/112)).
+- Specify only "ntasks_model" in SLURM resource request ([PR #106](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/106)).
+
+### Fixed
+
+- UDUNITS error ([PR #101](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/101), [PR #123](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/123)).
+
+-----------------------------
+
 ## [v3.0.0] - 2025-05-28
 
 - 0-diff vs. v2.0.0.

GEOS_LdasGridComp.F90

@@ -7,16 +7,15 @@ module GEOS_LdasGridCompMod
   ! !USES
 
   use ESMF
-  use MAPL_Mod
-
+  use MAPL
+  
   use GEOS_MetforceGridCompMod,  only: MetforceSetServices  => SetServices
   use GEOS_LandGridCompMod,      only: LandSetServices      => SetServices
   use GEOS_LandPertGridCompMod,  only: LandPertSetServices  => SetServices
   use GEOS_EnsGridCompMod,       only: EnsSetServices       => SetServices
   use GEOS_LandAssimGridCompMod, only: LandAssimSetServices => SetServices
   use GEOS_LandiceGridCompMod,   only: LandiceSetServices   => SetServices
 
-  use EASE_conv,              only: ease_inverse
   use LDAS_TileCoordType,     only: tile_coord_type , T_TILECOORD_STATE, TILECOORD_WRAP
   use LDAS_TileCoordType,     only: grid_def_type, io_grid_def_type, operator (==)
   use LDAS_TileCoordRoutines, only: get_minExtent_grid, get_ij_ind_from_latlon, io_domain_files
@@ -537,12 +536,12 @@ subroutine Initialize(gc, import, export, clock, rc)
        call ESMF_GRID_INTERIOR(agrid,I1,IN,J1,JN)
 
        do I = 1,size(centerX,1)
-          call ease_inverse(gridname,1.0*(I+I1-2),0.0,lat,lon)
+          call MAPL_ease_inverse(gridname,1.0*(I+I1-2),0.0,lat,lon)
           centerX(I,:) = lon * MAPL_DEGREES_TO_RADIANS
        enddo
 
        do J = 1,size(centerY,2)
-          call ease_inverse(gridname,0.0,1.0*(J+J1-2),lat,lon)
+          call MAPL_ease_inverse(gridname,0.0,1.0*(J+J1-2),lat,lon)
           centerY(:,J) = lat * MAPL_DEGREES_TO_RADIANS
        enddo
 

GEOSlandassim_GridComp/clsm_ensupd_enkf_update.F90

@@ -74,8 +74,8 @@ module clsm_ensupd_enkf_update
   use nr_ran2_gasdev,                   ONLY:     &
        NRANDSEED
 
-  use ease_conv,                        ONLY:     &
-       ease_convert
+  use MAPL,                             ONLY:     &
+       MAPL_ease_convert
 
   use my_matrix_functions,              ONLY:     &
        row_std
@@ -2235,7 +2235,7 @@ subroutine write_smapL4SMaup( option, date_time, exp_id, N_ens,    &
                   )
 
                 if (index(tile_grid_g%gridtype, 'M09') /=0) then 
-                   call  ease_convert(trim(tile_grid_g%gridtype), this_lat, this_lon, col_ind, row_ind)                
+                   call  MAPL_ease_convert(trim(tile_grid_g%gridtype), this_lat, this_lon, col_ind, row_ind)                
                 endif
 
                 ! col_ind and row_ind are zero-based, need one-based index here
@@ -2254,7 +2254,7 @@ subroutine write_smapL4SMaup( option, date_time, exp_id, N_ens,    &
                   )
 
                 if (index(tile_grid_g%gridtype, 'M09') /=0) then
-                   call  ease_convert(trim(tile_grid_g%gridtype), this_lat, this_lon, col_ind, row_ind)             
+                   call  MAPL_ease_convert(trim(tile_grid_g%gridtype), this_lat, this_lon, col_ind, row_ind)             
                 endif                
 
                 ! col_ind and row_ind are zero-based, need one-based index here
@@ -2278,7 +2278,7 @@ subroutine write_smapL4SMaup( option, date_time, exp_id, N_ens,    &
                 if (index(tile_grid_g%gridtype, 'M09') /=0) then
                    ! subindex (1:7) to get the string EASEvx_
                    gridname_tmp = tile_grid_g%gridtype(1:7)//'M36'
-                   call  ease_convert(gridname_tmp, this_lat, this_lon, col_ind, row_ind)                
+                   call  MAPL_ease_convert(gridname_tmp, this_lat, this_lon, col_ind, row_ind)                
                 endif
 
                 ! col_ind and row_ind are zero-based, need one-based index here

GEOSlandassim_GridComp/clsm_ensupd_read_obs.F90

@@ -25,9 +25,9 @@ module clsm_ensupd_read_obs
   use io_hdf5,                          ONLY:     &
        hdf5read 
 
-  use EASE_conv,                        ONLY:     &
-       ease_convert,                              &
-       ease_extent
+  use MAPL,                             ONLY:     &
+       MAPL_ease_convert,                         &
+       MAPL_ease_extent
 
   use LDAS_ensdrv_globals,              ONLY:     &
        logit,                                     &
@@ -5542,12 +5542,12 @@ subroutine read_obs_SMOS( date_time, N_catd, this_obs_param,      &
 
                    if (tmp_tile_num(ii)>0) then
 
-                      call ease_convert('EASEv2_M36',             &
+                      call MAPL_ease_convert('EASEv2_M36',        &
                            tile_coord(tmp_tile_num(ii))%com_lat,  &
                            tile_coord(tmp_tile_num(ii))%com_lon,  &
                            M36_col_ind_tile, M36_row_ind_tile  )
 
-                      call ease_convert('EASEv2_M36',             &
+                      call MAPL_ease_convert('EASEv2_M36',        &
                            tmp_lat(ii),                           &
                            tmp_lon(ii),                           &
                            M36_col_ind_obs,  M36_row_ind_obs  )
@@ -7159,12 +7159,12 @@ subroutine read_obs_SMAP_FT( date_time, N_catd, this_obs_param,            &
 
                    if (tmp_tile_num(ii)>0) then
 
-                      call ease_convert('EASEv2_M09',                  &
+                      call MAPL_ease_convert('EASEv2_M09',        &
                            tile_coord(tmp_tile_num(ii))%com_lat,  &
                            tile_coord(tmp_tile_num(ii))%com_lon,  &
                            M09_col_ind_tile, M09_row_ind_tile  )
 
-                      call ease_convert('EASEv2_M09',                  &
+                      call MAPL_ease_convert('EASEv2_M09',        &
                            tmp_lat(ii),                           &
                            tmp_lon(ii),                           &
                            M09_col_ind_obs,  M09_row_ind_obs  )
@@ -8229,12 +8229,12 @@ subroutine read_obs_SMAP_halforbit_Tb( date_time, N_catd, this_obs_param,  &
 
                    if (tmp_tile_num(ii)>0) then
 
-                      call ease_convert('EASEv2_M36',                  &
+                      call MAPL_ease_convert('EASEv2_M36',        &
                            tile_coord(tmp_tile_num(ii))%com_lat,  &
                            tile_coord(tmp_tile_num(ii))%com_lon,  &
                            M36_col_ind_tile, M36_row_ind_tile  )
 
-                      call ease_convert('EASEv2_M36',                  &
+                      call MAPL_ease_convert('EASEv2_M36',        &
                            tmp_lat(ii),                           &
                            tmp_lon(ii),                           &
                            M36_col_ind_obs,  M36_row_ind_obs  )
@@ -8529,7 +8529,7 @@ subroutine turn_off_assim_SMAP_L1CTb(N_obs_param, obs_param, N_obsl, Observation
        !
        ! assemble 36 km EASEv2 mask of L2AP_Tb obs 
 
-       call ease_extent( 'EASEv2_M36', N_cols, N_rows )
+       call MAPL_ease_extent( 'EASEv2_M36', N_cols, N_rows )
 
        allocate( mask_h_A(N_cols,N_rows) )
        allocate( mask_h_D(N_cols,N_rows) )
@@ -8551,7 +8551,7 @@ subroutine turn_off_assim_SMAP_L1CTb(N_obs_param, obs_param, N_obsl, Observation
 
                 if  (Observations_f(ii)%species==species_L2AP_Tbh_A) then  
 
-                   call ease_convert('EASEv2_M36', Observations_f(ii)%lat, Observations_f(ii)%lon, &
+                   call MAPL_ease_convert('EASEv2_M36', Observations_f(ii)%lat, Observations_f(ii)%lon, &
                         col, row)
 
                    ! set mask=.true. for the M36 grid cell that contains the L2AP_Tb obs;
@@ -8573,7 +8573,7 @@ subroutine turn_off_assim_SMAP_L1CTb(N_obs_param, obs_param, N_obsl, Observation
 
                 if  (Observations_f(ii)%species==species_L2AP_Tbh_D) then  
 
-                   call ease_convert('EASEv2_M36', Observations_f(ii)%lat, Observations_f(ii)%lon, &
+                   call MAPL_ease_convert('EASEv2_M36', Observations_f(ii)%lat, Observations_f(ii)%lon, &
                         col, row)
 
                    ! set mask=.true. for the M36 grid cell that contains the L2AP_Tb obs;
@@ -8595,7 +8595,7 @@ subroutine turn_off_assim_SMAP_L1CTb(N_obs_param, obs_param, N_obsl, Observation
 
                 if  (Observations_f(ii)%species==species_L2AP_Tbv_A) then  
 
-                   call ease_convert('EASEv2_M36', Observations_f(ii)%lat, Observations_f(ii)%lon, &
+                   call MAPL_ease_convert('EASEv2_M36', Observations_f(ii)%lat, Observations_f(ii)%lon, &
                         col, row)
 
                    ! set mask=.true. for the M36 grid cell that contains the L2AP_Tb obs;
@@ -8617,7 +8617,7 @@ subroutine turn_off_assim_SMAP_L1CTb(N_obs_param, obs_param, N_obsl, Observation
 
                 if  (Observations_f(ii)%species==species_L2AP_Tbv_D) then  
 
-                   call ease_convert('EASEv2_M36', Observations_f(ii)%lat, Observations_f(ii)%lon, &
+                   call MAPL_ease_convert('EASEv2_M36', Observations_f(ii)%lat, Observations_f(ii)%lon, &
                         col, row)
 
                    ! set mask=.true. for the M36 grid cell that contains the L2AP_Tb obs;
@@ -8652,7 +8652,7 @@ subroutine turn_off_assim_SMAP_L1CTb(N_obs_param, obs_param, N_obsl, Observation
 
              if (Observations_l(ii)%species==species_L1C_Tbh_A) then  
 
-                call ease_convert('EASEv2_M36',                                      &
+                call MAPL_ease_convert('EASEv2_M36',                                      &
                      Observations_l(ii)%lat, Observations_l(ii)%lon, col, row)
 
                 ! note conversion to one-based indices
@@ -8671,7 +8671,7 @@ subroutine turn_off_assim_SMAP_L1CTb(N_obs_param, obs_param, N_obsl, Observation
 
              if (Observations_l(ii)%species==species_L1C_Tbh_D) then  
 
-                call ease_convert('EASEv2_M36',                                      &
+                call MAPL_ease_convert('EASEv2_M36',                                      &
                      Observations_l(ii)%lat, Observations_l(ii)%lon, col, row)
 
                 ! note conversion to one-based indices
@@ -8692,7 +8692,7 @@ subroutine turn_off_assim_SMAP_L1CTb(N_obs_param, obs_param, N_obsl, Observation
 
              if (Observations_l(ii)%species==species_L1C_Tbv_A) then  
 
-                call ease_convert('EASEv2_M36',                                      &
+                call MAPL_ease_convert('EASEv2_M36',                                      &
                      Observations_l(ii)%lat, Observations_l(ii)%lon, col, row)
 
                 ! note conversion to one-based indices
@@ -8711,7 +8711,7 @@ subroutine turn_off_assim_SMAP_L1CTb(N_obs_param, obs_param, N_obsl, Observation
 
              if (Observations_l(ii)%species==species_L1C_Tbv_D) then  
 
-                call ease_convert('EASEv2_M36',                                      &
+                call MAPL_ease_convert('EASEv2_M36',                                      &
                      Observations_l(ii)%lat, Observations_l(ii)%lon, col, row)
 
                 ! note conversion to one-based indices

GEOSldas_App/CMakeLists.txt

@@ -39,7 +39,7 @@ configure_file(${file} ${file} @ONLY)
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${file} DESTINATION bin)
 
 file(GLOB rc_files  GEOSldas_*rc)
-file(GLOB nml_files LDASsa_DEFAULT*nml)
+file(GLOB nml_files LDASsa_DEFAULT*nml LandAtmDAS_nml/LDASsa_SPECIAL*nml	)
 
 install(
    FILES ${rc_files} ${nml_files}

GEOSldas_App/GEOSldas_HIST.rc

@@ -1,24 +1,23 @@
 # Sample HISTORY.rc file for GEOSldas
 #
 # This HISTORY template is edited by "ldas_setup" via "process_hist.csh".  
-# The strings '#ASSIM', '#EASE', and '#CUBE' are *not* linked to MAPL HISTORY 
-# functionality.  For example, the line 
-#    "#CUBE            'tavg24_2d_lnd_Nx'"
-#  does *not* mean that the 'lnd' output will be on a cube-sphere grid. 
 
-#CUBE VERSION: 1
+VERSION: 1
+
+# Must edit 'EXPID' manually if HISTORY file is re-used without going through "ldas_setup".
 
-# Must edit 'EXPID' manually if HISTORY file is re-used without going  
-#  through "ldas_setup".
-#
 EXPID:  GEOSldas_expid
 
+# ------------------------------------------------------------------------------------------------
+
+# pre-defined Collections
+
 COLLECTIONS:
-#EASE            'tavg24_1d_lfs_Nt'
-#CUBE            'tavg24_2d_lfs_Nx'	
-#EASE            'tavg24_1d_lnd_Nt'	
-#CUBE            'tavg24_2d_lnd_Nx'
-#ASSIM           'SMAP_L4_SM_gph'
+#OUT1d           'tavg24_1d_lfs_Nt'
+#OUT2d           'tavg24_2d_lfs_Nx'
+#OUT1d           'tavg24_1d_lnd_Nt'
+#OUT2d           'tavg24_2d_lnd_Nx'
+#                'SMAP_L4_SM_gph'
 #                'inst1_1d_lnr_Nt'
 #                'catch_progn_incr'
 #                'inst3_1d_lndfcstana_Nt'
@@ -29,24 +28,34 @@ COLLECTIONS:
 #                'tavg24_1d_glc_Nt'
            ::
 
-#CUBE GRID_LABELS: PC720x361-DC
-#CUBE              PC1440x721-DC
+# --------------------------------------------------------------------------------------------------
+
+# 2d output can be on the following grids (see [COLLECTION_NAME].grid_label])
+
+GRID_LABELS: PC720x361-DC
+             PC1440x721-DC
+             EASEv2_M36
+      ::
+
+PC720x361-DC.GRID_TYPE:  LatLon
+PC720x361-DC.IM_WORLD:   720
+PC720x361-DC.JM_WORLD:   361
+PC720x361-DC.POLE:       PC
+PC720x361-DC.DATELINE:   DC
+PC720x361-DC.LM:         1
 
-#CUBE      ::
+PC1440x721-DC.GRID_TYPE: LatLon
+PC1440x721-DC.IM_WORLD:  1440
+PC1440x721-DC.JM_WORLD:   721
+PC1440x721-DC.POLE:      PC
+PC1440x721-DC.DATELINE:  DC
+PC1440x721-DC.LM:        1
 
-#CUBE PC720x361-DC.GRID_TYPE: LatLon
-#CUBE PC720x361-DC.IM_WORLD: 720
-#CUBE PC720x361-DC.JM_WORLD: 361
-#CUBE PC720x361-DC.POLE: PC
-#CUBE PC720x361-DC.DATELINE: DC
-#CUBE PC720x361-DC.LM: 1
+EASEv2_M36.GRID_TYPE:    EASE
+EASEv2_M36.GRIDNAME:     EASEv2_M36
+EASEv2_M36.LM:           1
 
-#CUBE PC1440x721-DC.GRID_TYPE: LatLon
-#CUBE PC1440x721-DC.IM_WORLD: 1440
-#CUBE PC1440x721-DC.JM_WORLD: 721
-#CUBE PC1440x721-DC.POLE: PC
-#CUBE PC1440x721-DC.DATELINE: DC
-#CUBE PC1440x721-DC.LM: 1
+# --------------------------------------------------------------------------------------------------
 
 # Detailed definition of the collections listed above 
 #
@@ -219,15 +228,16 @@ COLLECTIONS:
 
   tavg24_2d_lnd_Nx.format:        'CFIO',
   tavg24_2d_lnd_Nx.descr:         '2d,Daily,Time-Averaged,Single-Level,Assimilation,Land Surface Diagnostics',
-  tavg24_2d_lnd_Nx.nbits:        12,
+  tavg24_2d_lnd_Nx.nbits:         12,
   tavg24_2d_lnd_Nx.template:      '%y4%m2%d2_%h2%n2z.nc4',
   tavg24_2d_lnd_Nx.mode:          'time-averaged',
   tavg24_2d_lnd_Nx.frequency:     240000,
   tavg24_2d_lnd_Nx.ref_time:      000000,
-  tavg24_2d_lnd_Nx.regrid_exch:   '../input/tile.data'
-  tavg24_2d_lnd_Nx.regrid_name:   'GRIDNAME'
+  tavg24_2d_lnd_Nx.regrid_exch:   '../input/tile.data',
+  tavg24_2d_lnd_Nx.regrid_name:   'GRIDNAME',
 #  tavg24_2d_lnd_Nx.regrid_method: 'BILINEAR_MONOTONIC' ,                           
-  tavg24_2d_lnd_Nx.grid_label:    PC720x361-DC
+  tavg24_2d_lnd_Nx.grid_label:    PC720x361-DC,
+#  tavg24_2d_lnd_Nx.grid_label:   EASEv2_M36,
   tavg24_2d_lnd_Nx.deflate:       2,
   tavg24_2d_lnd_Nx.fields:     'GRN'        , 'VEGDYN'  ,
                                'LAI'        , 'VEGDYN'  ,

GEOSldas_App/LDASsa_DEFAULT_inputs_ensprop.nml

@@ -188,8 +188,8 @@ coarsen_force_pert%wind  = .false.
 ! (limits on range of random numbers: specify max absolute value
 !  allowed to be drawn from a standard normal distribution)
 
-std_normal_max_force_pert%pcp   = 2.5
-std_normal_max_force_pert%sw    = 2.5
+std_normal_max_force_pert%pcp   = 3.
+std_normal_max_force_pert%sw    = 3.
 std_normal_max_force_pert%lw    = 2.5
 std_normal_max_force_pert%tair  = 2.5
 std_normal_max_force_pert%qair  = 2.5