From 96b43fb458fe00696d9532e547a3c5bff113f9f9 Mon Sep 17 00:00:00 2001 From: Tony Craig Date: Wed, 18 Oct 2023 10:46:25 -0700 Subject: [PATCH] Update Icepack CPP USE_SNICARHC to NO_SNICARHC and update logic (#886) Update Icepack to version #0c548120ce44382 Oct 16, 2023 includes NO_SNICARHC --- configuration/scripts/cice.build | 4 ++-- doc/source/user_guide/ug_case_settings.rst | 2 +- icepack | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configuration/scripts/cice.build b/configuration/scripts/cice.build index 775b5a364..33411158b 100755 --- a/configuration/scripts/cice.build +++ b/configuration/scripts/cice.build @@ -124,8 +124,8 @@ else if (${ICE_IOTYPE} =~ pio*) then else set IODIR = io_binary endif -if (${ICE_SNICARHC} == 'true') then - setenv ICE_CPPDEFS "${ICE_CPPDEFS} -DUSE_SNICARHC" +if (${ICE_SNICARHC} == 'false') then + setenv ICE_CPPDEFS "${ICE_CPPDEFS} -DNO_SNICARHC" endif ### List of source code directories (in order of importance). diff --git a/doc/source/user_guide/ug_case_settings.rst b/doc/source/user_guide/ug_case_settings.rst index 16f6ebe6f..09145eeab 100644 --- a/doc/source/user_guide/ug_case_settings.rst +++ b/doc/source/user_guide/ug_case_settings.rst @@ -36,8 +36,8 @@ can be found in :ref:`cicecpps`. The following CPPs are available. "NO_F2003", "Turns off some Fortran 2003 features" "NO_I8", "Converts integer*8 to integer*4. This could have adverse affects for certain algorithms including the ddpdd implementation associated with the ``bfbflag``" "NO_R16", "Converts real*16 to real*8. This could have adverse affects for certain algorithms including the lsum16 implementation associated with the ``bfbflag``" + "NO_SNICARHC", "Does not compile hardcoded (HC) 5 band snicar tables tables needed by ``shortwave=dEdd_snicar_ad``. May reduce compile time." "USE_NETCDF", "Turns on netcdf code. This is normally on and is needed for released configurations. An older value, ncdf, is still supported" - "USE_SNICARHC", "Includes compilation of large dEdd hardcoded (HC) SNICAR table in Icepack" "","" "**Application Macros**", "" "CESMCOUPLED", "Turns on code changes for the CESM coupled application " diff --git a/icepack b/icepack index 8fad768ce..0c548120c 160000 --- a/icepack +++ b/icepack @@ -1 +1 @@ -Subproject commit 8fad768ce400536904f376376e91c698a82882ba +Subproject commit 0c548120ce443824241051196f5ba508cb7ba7db