diff --git a/columnphysics/icepack_algae.F90 b/columnphysics/icepack_algae.F90 index 7239edd1..a39b4a64 100644 --- a/columnphysics/icepack_algae.F90 +++ b/columnphysics/icepack_algae.F90 @@ -394,8 +394,7 @@ subroutine zbio (dt, & bio_index, & aicen, & vicen, vsnon, & - iphin, &! ntrcr - trcrn, aice_old, &!aice_old + iphin, trcrn, & flux_bion, flux_bio, & upNOn, upNHn, & upNO, upNH, & diff --git a/columnphysics/icepack_itd.F90 b/columnphysics/icepack_itd.F90 index 312dfb57..518d26ab 100644 --- a/columnphysics/icepack_itd.F90 +++ b/columnphysics/icepack_itd.F90 @@ -434,7 +434,6 @@ subroutine shift_ice (trcr_depend, & worka, workb real (kind=dbl_kind), dimension(ncat) :: aicen_init - real (kind=dbl_kind), dimension(ncat) :: vicen_init real (kind=dbl_kind), dimension(ncat) :: vsnon_init character(len=*),parameter :: subname='(shift_ice)' @@ -444,7 +443,6 @@ subroutine shift_ice (trcr_depend, & !----------------------------------------------------------------- aicen_init(:) = aicen(:) - vicen_init(:) = vicen(:) vsnon_init(:) = vsnon(:) !----------------------------------------------------------------- diff --git a/columnphysics/icepack_zbgc_shared.F90 b/columnphysics/icepack_zbgc_shared.F90 index 08c6753d..b7d3ec6e 100644 --- a/columnphysics/icepack_zbgc_shared.F90 +++ b/columnphysics/icepack_zbgc_shared.F90 @@ -588,8 +588,7 @@ subroutine merge_bgc_fluxes (dt, & bio_index, & aicen, & vicen, vsnon, & - iphin, & - trcrn, aice_init, & + iphin, trcrn, & flux_bion, flux_bio, & upNOn, upNHn, & upNO, upNH, & @@ -618,8 +617,7 @@ subroutine merge_bgc_fluxes (dt, & real (kind=dbl_kind), intent(in):: & aicen , & ! concentration of ice vicen , & ! volume of ice (m) - vsnon , & ! volume of snow(m) - aice_init ! initial concentration of ice + vsnon ! volume of snow(m) ! single category rates real (kind=dbl_kind), dimension(:), intent(in):: & diff --git a/doc/source/user_guide/ug_running.rst b/doc/source/user_guide/ug_running.rst index ad86df1f..1cc5f100 100755 --- a/doc/source/user_guide/ug_running.rst +++ b/doc/source/user_guide/ug_running.rst @@ -390,8 +390,12 @@ On macOS: .. code-block:: bash - # Download the Miniconda installer to ~/Downloads/miniconda.sh + # Check hardware platform (x86_64 or arm64) + uname -m + # Download the compatible Miniconda installer to ~/Downloads/miniconda.sh curl -L https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o ~/Downloads/miniconda.sh + # or + curl -L https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-arm64.sh -o ~/Downloads/miniconda.sh # Install Miniconda bash ~/Downloads/miniconda.sh