Skip to content

Commit

Permalink
ice_dyn_vp: rename 'CICE_USE_LAPACK' macro to 'USE_LAPACK'
Browse files Browse the repository at this point in the history
Bring the name of the new macro 'CICE_USE_LAPACK' more in line with the
changes to the CPP macros in 819eedd (Update CPP implementation (CICE-Consortium#490),
2020-07-31) by renaming it to 'USE_LAPACK'.
  • Loading branch information
phil-blain committed Aug 11, 2020
1 parent f2dfa62 commit e609c48
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions cicecore/cicedynB/dynamics/ice_dyn_vp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ subroutine anderson_solver (icellt , icellu, &
prog_norm , & ! norm of difference between current and previous solution
nlres_norm ! norm of current nonlinear residual : F(x) = A(x)x -b(x)

#ifdef CICE_USE_LAPACK
#ifdef USE_LAPACK
real (kind=dbl_kind) :: &
ddot, dnrm2 ! external BLAS functions
#endif
Expand Down Expand Up @@ -940,7 +940,7 @@ subroutine anderson_solver (icellt , icellu, &

! Compute fixed point residual f(x) = g(x) - x
res = fpfunc - sol
#ifdef CICE_USE_LAPACK
#ifdef USE_LAPACK
fpres_norm = global_sum(dnrm2(size(res), res, inc)**2, distrb_info)
#else
call vec_to_arrays (nx_block , ny_block , &
Expand Down Expand Up @@ -980,7 +980,7 @@ subroutine anderson_solver (icellt , icellu, &
! Simple fixed point (Picard) iteration in this case
sol = fpfunc
else
#ifdef CICE_USE_LAPACK
#ifdef USE_LAPACK
! Begin Anderson acceleration
if (get_num_procs() > 1) then
! Anderson solver is not yet parallelized; abort
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/options/set_env.lapack
Original file line number Diff line number Diff line change
@@ -1 +1 @@
setenv ICE_CPPDEFS -DCICE_USE_LAPACK
setenv ICE_CPPDEFS -DUSE_LAPACK

0 comments on commit e609c48

Please sign in to comment.