bug fixing after manual merge

dngoldberg · May 20, 2024 · 6c4873e · 6c4873e
1 parent 82731e6
commit 6c4873e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/shelfice/SHELFICE.h b/pkg/shelfice/SHELFICE.h
@@ -138,6 +138,7 @@ CEOP
  & SHELFICEuseGammaFrict,
  & SHELFICE_oldCalcUStar,
  & SHELFICEMassStepping,
+ & SHI_update_kTopC,
  & SHELFICEDynMassOnly,
  & SHELFICE_massmin_truedens,
  & SHELFICE_conserve_ssh
@@ -158,6 +159,7 @@ CEOP
  LOGICAL SHELFICE_oldCalcUStar
  LOGICAL SHELFICEMassStepping
  LOGICAL SHELFICEDynMassOnly
+ LOGICAL SHI_update_kTopC
  LOGICAL SHELFICE_massmin_truedens
  LOGICAL SHELFICE_conserve_ssh