Remove extra use call and artifacts from merge conflict

ESCOMP · Feb 11, 2025 · 13cfc2a · 13cfc2a
1 parent 5977198
commit 13cfc2a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/physics/cam7/physpkg.F90 b/src/physics/cam7/physpkg.F90
@@ -1550,6 +1550,7 @@ subroutine tphysac (ztodt,   cam_in,  &
     ifld = pbuf_get_index('AST')
     call pbuf_get_field(pbuf, ifld, ast, start=(/1,1,itim_old/), kount=(/pcols,pver,1/) )
 
+    call cnst_get_ind('Q', ixq)
     call cnst_get_ind('CLDLIQ', ixcldliq)
     call cnst_get_ind('CLDICE', ixcldice)
 

diff --git a/src/physics/simple/physpkg.F90 b/src/physics/simple/physpkg.F90
@@ -211,7 +211,6 @@ subroutine phys_init( phys_state, phys_tend, pbuf2d, cam_in, cam_out )
     use constituents,       only: cnst_get_ind
 
 
-    use constituents,    only: cnst_get_ind
     use ccpp_constituent_prop_mod, only: ccpp_const_props_init
 
     ! Input/output arguments