Merge branch 'develop' into feature/wjiang/cleanup_template

GEOS-ESM · Apr 11, 2024 · b021c30 · b021c30
2 parents 67ac784 + 83089f5
commit b021c30
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,3 @@
 *#
 .#*
 **/CVS/
-
-/@GEOSgcm_GridComp
-/GEOSgcm_GridComp
-/GEOSgcm_GridComp@
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,8 +15,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -----------------------------
 
+## [v1.0.2] - 2024-04-11
+
+- 0-diff vs. v1.0.1.
+
+### Fixed
+
+- Bugfix for state increment array referencing in update_type=13.
+
+### Changed
+
+- Moved external `GEOSgcm_GridComp` repository to under `GEOSldas/src/Components` for
+  consistency with directory structure of GEOSgcm and GEOSadas.
+
+-----------------------------
+
 ## [v1.0.1] - 2024-04-10
 
+- 0-diff vs. v1.0.0.
+
 ### Fixed
 
 - ldas_setup: Changed entry 'slurm' to 'slurm_pbs' to match remap_params.tpl

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,5 @@
 esma_set_this ()
 
-esma_add_subdirectory(GEOSgcm_GridComp)
-
 set (alldirs
   GEOSmetforce_GridComp
   GEOSlandpert_GridComp

diff --git a/GEOSlandassim_GridComp/clsm_ensupd_upd_routines.F90 b/GEOSlandassim_GridComp/clsm_ensupd_upd_routines.F90
@@ -4805,21 +4805,21 @@ subroutine cat_enkf_increments(                               &
                    State_incr(1,:) = cat_progn( kk,:)%srfexc/scale_srfexc
                    State_incr(2,:) = cat_progn( kk,:)%rzexc /scale_rzexc
 
-                   State_incr(4,:) = cat_progn( kk,:)%tc1   /scale_temp
-                   State_incr(5,:) = cat_progn( kk,:)%tc2   /scale_temp
-                   State_incr(6,:) = cat_progn( kk,:)%tc4   /scale_temp
-                   State_incr(7,:) = cat_progn( kk,:)%ght(1)/scale_ght1
+                   State_incr(3,:) = cat_progn( kk,:)%tc1   /scale_temp
+                   State_incr(4,:) = cat_progn( kk,:)%tc2   /scale_temp
+                   State_incr(5,:) = cat_progn( kk,:)%tc4   /scale_temp
+                   State_incr(6,:) = cat_progn( kk,:)%ght(1)/scale_ght1
 
                 else
 
                    State_incr(1,:) = cat_progn( kk,:)%srfexc/scale_srfexc
                    State_incr(2,:) = cat_progn( kk,:)%rzexc /scale_rzexc
                    State_incr(3,:) = cat_progn( kk,:)%catdef/scale_catdef   ! catdef in State
 
-                   State_incr(3,:) = cat_progn( kk,:)%tc1   /scale_temp
-                   State_incr(4,:) = cat_progn( kk,:)%tc2   /scale_temp
-                   State_incr(5,:) = cat_progn( kk,:)%tc4   /scale_temp
-                   State_incr(6,:) = cat_progn( kk,:)%ght(1)/scale_ght1
+                   State_incr(4,:) = cat_progn( kk,:)%tc1   /scale_temp
+                   State_incr(5,:) = cat_progn( kk,:)%tc2   /scale_temp
+                   State_incr(6,:) = cat_progn( kk,:)%tc4   /scale_temp
+                   State_incr(7,:) = cat_progn( kk,:)%ght(1)/scale_ght1
 
                 end if
 
@@ -4863,21 +4863,21 @@ subroutine cat_enkf_increments(                               &
                    cat_progn_incr(kk,:)%srfexc = State_incr(1,:)*scale_srfexc
                    cat_progn_incr(kk,:)%rzexc  = State_incr(2,:)*scale_rzexc
 
-                   cat_progn_incr(kk,:)%tc1    = State_incr(4,:)*scale_temp
-                   cat_progn_incr(kk,:)%tc2    = State_incr(5,:)*scale_temp
-                   cat_progn_incr(kk,:)%tc4    = State_incr(6,:)*scale_temp
-                   cat_progn_incr(kk,:)%ght(1) = State_incr(7,:)*scale_ght1
+                   cat_progn_incr(kk,:)%tc1    = State_incr(3,:)*scale_temp
+                   cat_progn_incr(kk,:)%tc2    = State_incr(4,:)*scale_temp
+                   cat_progn_incr(kk,:)%tc4    = State_incr(5,:)*scale_temp
+                   cat_progn_incr(kk,:)%ght(1) = State_incr(6,:)*scale_ght1
 
                 else
 
                    cat_progn_incr(kk,:)%srfexc = State_incr(1,:)*scale_srfexc
                    cat_progn_incr(kk,:)%rzexc  = State_incr(2,:)*scale_rzexc
                    cat_progn_incr(kk,:)%catdef = State_incr(3,:)*scale_catdef   ! catdef in State 
 
-                   cat_progn_incr(kk,:)%tc1    = State_incr(3,:)*scale_temp
-                   cat_progn_incr(kk,:)%tc2    = State_incr(4,:)*scale_temp
-                   cat_progn_incr(kk,:)%tc4    = State_incr(5,:)*scale_temp
-                   cat_progn_incr(kk,:)%ght(1) = State_incr(6,:)*scale_ght1
+                   cat_progn_incr(kk,:)%tc1    = State_incr(4,:)*scale_temp
+                   cat_progn_incr(kk,:)%tc2    = State_incr(5,:)*scale_temp
+                   cat_progn_incr(kk,:)%tc4    = State_incr(6,:)*scale_temp
+                   cat_progn_incr(kk,:)%ght(1) = State_incr(7,:)*scale_ght1
 
                 end if