Skip to content

Issue623 adding new budget terms #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
docguibou wants to merge 16 commits into
base: develop
Choose a base branch
from
Draft

Issue623 adding new budget terms #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c090611
Adding 7 new source terms that can be outputted
Dec 7, 2022
6878035
Fixing small bugs
Dec 7, 2022
ef805d8
Better but may not balance yet
Dec 15, 2022
8e986cb
improving naming consistency
Dec 16, 2022
47f195d
improving consistency between volume and area budget terms
Dec 16, 2022
baa07df
Changing sign for dci_young2old (not consistent with dvi)
Dec 19, 2022
4a7bb4b
Merge remote-tracking branch 'origin/develop' into issue623_adding_ne…
einola May 16, 2023
5498128
bug fix for variable del_vi_young2ice
Jul 15, 2023
e566721
Merge branch 'develop' into issue623_adding_new_budget_terms
Aug 28, 2023
7fabfc4
update env_compile_intel_linux.bash after fram update
Nov 17, 2023
1dd6e41
Merge branch 'develop' into issue623_adding_new_budget_terms
Nov 23, 2023
af98428
runs, compiles and relatively well balanced over winter
Dec 6, 2023
456d4ea
bugfix del_ci_ridge_myi
Dec 13, 2023
c711147
Merge branch 'develop' into issue623_adding_new_budget_terms
Dec 13, 2023
45d14bb
quick fix for snow2ice_young that was not included in del_hi_young
Dec 15, 2023
40b36a8
A few changes in the myi code. The myi area budget is now balanced (o…
Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions env_compile_intel_linux.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export NEXTSIMDIR=`pwd`

# AeroBulk turbulent air-sea flux computation
#--------------------------------------------
l_aerobulk=true ; # Call AeroBulk to compute air-sea fluxes ? If true, give the appropriate value for "AEROBULK_DIR" in the arch CASE block...
l_aerobulk=false ; # Call AeroBulk to compute air-sea fluxes ? If true, give the appropriate value for "AEROBULK_DIR" in the arch CASE block...
if ${l_aerobulk}; then
export USE_AEROBULK=true
# => then, later before launching neXtSIM, pick an algorithm by setting `ocean_bulk_formula=<algo>` of the `thermo` block in the config file
Expand Down Expand Up @@ -74,7 +74,7 @@ NXTSM_DEP_DIR="/opt/nextsim_intel" ; # path to directory containing compiled BOO
######################################################################
# Host-specific adjustment of previously defined variables if needed #
######################################################################
case `hostname | cut -d. -f2` in
case `hostname -f | cut -d. -f2` in
"merlat" ) export LDFLAGS="-L${INTEL_COMP_DIR}/compiler/lib/intel64_lin -limf"
;;
"ige-mcpc-36" ) NXTSM_DEP_DIR="/opt/nextsim_intel"
Expand Down Expand Up @@ -105,16 +105,16 @@ case `hostname | cut -d. -f2` in
#
export LDFLAGS="-L${INTEL_COMP_DIR}/compiler/lib/intel64_lin -lifcore -lifport"
;;
"fram" ) NXTSM_DEP_DIR="/cluster/projects/nn9878k/brodeau/opt/nextsim_intel"
INTEL_VERSION="2018.1.163"
INTEL_ROOT="/cluster/software/ifort/${INTEL_VERSION}-GCC-6.4.0-2.28"
export INTEL_COMP_DIR="${INTEL_ROOT}/compilers_and_libraries_${INTEL_VERSION}/linux"
export MPI_DIR="/cluster/software/impi/${INTEL_VERSION}-iccifort-${INTEL_VERSION}-GCC-6.4.0-2.28/intel64"
export NETCDF_DIR="/cluster/software/netCDF/4.4.1.1-intel-2018a-HDF5-1.8.19"
export NETCDF_CXX_DIR="/cluster/software/netCDF-C++4/4.3.0-intel-2018a-HDF5-1.8.19"
"fram" ) NXTSM_DEP_DIR="/cluster/projects/nn9878k/guibou/nextsim_intel/opt/"
INTEL_VERSION="2022.1.0"
INTEL_ROOT="/cluster/software/intel-compilers/${INTEL_VERSION}"
export INTEL_COMP_DIR="/cluster/software/intel-compilers/${INTEL_VERSION}/compiler/latest/linux/"
export MPI_DIR="/cluster/software/impi/2021.6.0-intel-compilers-${INTEL_VERSION}/mpi/latest/"
export NETCDF_DIR="/cluster/software/netCDF/4.9.0-iimpi-2022a/"
export NETCDF_CXX_DIR="/cluster/software/netCDF/4.9.0-iimpi-2022a/"
#
export AEROBULK_DIR="/cluster/projects/nn9878k/brodeau/src/aerobulk"
export OASIS_DIR="/cluster/projects/nn9878k/brodeau/src/oasis3-mct"
export AEROBULK_DIR="/cluster/projects/nn9878k/guibou/NANUK/aerobulk/"
export OASIS_DIR="/cluster/projects/nn9878k/guibou/NANUK/oa3-mct_iimpi2022a/"
#
export LDFLAGS="-L${INTEL_COMP_DIR}/compiler/lib/intel64_lin -lifcore -lifport"
;;
Expand Down
Loading