clean up merge

E3SM-Project · Aug 20, 2023 · dd48a38 · dd48a38
1 parent a5804b0
commit dd48a38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/columnphysics/icepack_itd.F90 b/columnphysics/icepack_itd.F90
@@ -33,9 +33,9 @@ module icepack_itd
       use icepack_tracers,    only: nt_apnd, nt_hpnd, nt_fbri, tr_brine, nt_bgc_S, bio_index
       use icepack_tracers,    only: n_iso, tr_iso, nt_smice, nt_rsnw, nt_rhos, nt_sice
       use icepack_tracers,    only: icepack_compute_tracers
-      use icepack_parameters, only: solve_zsal, skl_bgc, z_tracers
+      use icepack_parameters, only: solve_zsal, skl_bgc, z_tracers, hi_min
       use icepack_parameters, only: kcatbound, kitd, saltflux_option, snwgrain, snwredist
-      use icepack_therm_shared, only: Tmin, hi_min
+      use icepack_therm_shared, only: Tmin
       use icepack_warnings,   only: warnstr, icepack_warnings_add
       use icepack_warnings,   only: icepack_warnings_setabort, icepack_warnings_aborted
       use icepack_zbgc_shared,only: zap_small_bgc

diff --git a/columnphysics/icepack_tracers.F90 b/columnphysics/icepack_tracers.F90
@@ -7,7 +7,7 @@
       module icepack_tracers
 
       use icepack_kinds
-      use icepack_parameters, only: c0, c1, puny, rhos, rsnw_fall, rsnwnew, Tocnfrz, tfrz_option
+      use icepack_parameters, only: c0, c1, puny, rhos, rsnw_fall, rhosnew, Tocnfrz, tfrz_option
       use icepack_parameters, only: snwredist, snwgrain
       use icepack_warnings, only: warnstr, icepack_warnings_add
       use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted