From f6349d34d1f44487fdc824d793f22ff7b679b8fe Mon Sep 17 00:00:00 2001 From: sfilippone Date: Sun, 23 Feb 2025 10:46:45 +0100 Subject: [PATCH] Provide alias deallocate_wrk for free_wrk. Document and use. --- amgprec/amg_c_prec_type.f90 | 1 + amgprec/amg_d_prec_type.f90 | 1 + amgprec/amg_s_prec_type.f90 | 1 + amgprec/amg_z_prec_type.f90 | 1 + docs/amg4psblas_1.2-guide.pdf | Bin 1874395 -> 1874411 bytes docs/html/userhtml0x.png | Bin 892 -> 804 bytes docs/html/userhtml1x.png | Bin 2060 -> 1884 bytes docs/html/userhtmlli2.html | 2 +- docs/html/userhtmlse5.html | 4 ++-- docs/src/userinterface.tex | 4 ++-- samples/cuda/amg_dexample_cuda.F90 | 2 +- 11 files changed, 10 insertions(+), 6 deletions(-) diff --git a/amgprec/amg_c_prec_type.f90 b/amgprec/amg_c_prec_type.f90 index 2ce58807..1df7d1f0 100644 --- a/amgprec/amg_c_prec_type.f90 +++ b/amgprec/amg_c_prec_type.f90 @@ -113,6 +113,7 @@ module amg_c_prec_type procedure, pass(prec) :: free => amg_c_prec_free procedure, pass(prec) :: allocate_wrk => amg_c_allocate_wrk procedure, pass(prec) :: free_wrk => amg_c_free_wrk + procedure, pass(prec) :: deallocate_wrk => amg_c_free_wrk procedure, pass(prec) :: is_allocated_wrk => amg_c_is_allocated_wrk procedure, pass(prec) :: get_complexity => amg_c_get_compl procedure, pass(prec) :: cmp_complexity => amg_c_cmp_compl diff --git a/amgprec/amg_d_prec_type.f90 b/amgprec/amg_d_prec_type.f90 index e2c48cc2..855d4651 100644 --- a/amgprec/amg_d_prec_type.f90 +++ b/amgprec/amg_d_prec_type.f90 @@ -113,6 +113,7 @@ module amg_d_prec_type procedure, pass(prec) :: free => amg_d_prec_free procedure, pass(prec) :: allocate_wrk => amg_d_allocate_wrk procedure, pass(prec) :: free_wrk => amg_d_free_wrk + procedure, pass(prec) :: deallocate_wrk => amg_d_free_wrk procedure, pass(prec) :: is_allocated_wrk => amg_d_is_allocated_wrk procedure, pass(prec) :: get_complexity => amg_d_get_compl procedure, pass(prec) :: cmp_complexity => amg_d_cmp_compl diff --git a/amgprec/amg_s_prec_type.f90 b/amgprec/amg_s_prec_type.f90 index e64703bc..d2e0033c 100644 --- a/amgprec/amg_s_prec_type.f90 +++ b/amgprec/amg_s_prec_type.f90 @@ -113,6 +113,7 @@ module amg_s_prec_type procedure, pass(prec) :: free => amg_s_prec_free procedure, pass(prec) :: allocate_wrk => amg_s_allocate_wrk procedure, pass(prec) :: free_wrk => amg_s_free_wrk + procedure, pass(prec) :: deallocate_wrk => amg_s_free_wrk procedure, pass(prec) :: is_allocated_wrk => amg_s_is_allocated_wrk procedure, pass(prec) :: get_complexity => amg_s_get_compl procedure, pass(prec) :: cmp_complexity => amg_s_cmp_compl diff --git a/amgprec/amg_z_prec_type.f90 b/amgprec/amg_z_prec_type.f90 index adeecf23..1907084b 100644 --- a/amgprec/amg_z_prec_type.f90 +++ b/amgprec/amg_z_prec_type.f90 @@ -113,6 +113,7 @@ module amg_z_prec_type procedure, pass(prec) :: free => amg_z_prec_free procedure, pass(prec) :: allocate_wrk => amg_z_allocate_wrk procedure, pass(prec) :: free_wrk => amg_z_free_wrk + procedure, pass(prec) :: deallocate_wrk => amg_z_free_wrk procedure, pass(prec) :: is_allocated_wrk => amg_z_is_allocated_wrk procedure, pass(prec) :: get_complexity => amg_z_get_compl procedure, pass(prec) :: cmp_complexity => amg_z_cmp_compl diff --git a/docs/amg4psblas_1.2-guide.pdf b/docs/amg4psblas_1.2-guide.pdf index faf76c480d7402e5f44d35137633eb87219dd7ae..147ac151cca8d3bc7e6d2fca51be493fe6400c63 100644 GIT binary patch delta 1783 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 Uh5EBYv@s?EH;M1& diff --git a/docs/html/userhtml0x.png b/docs/html/userhtml0x.png index f004430adb9751a9610cd765fec671d3449e8614..80ad45e69adb096146cffb12637243f59974d32d 100644 GIT binary patch delta 760 zcmV6ueh-fTG>N-5^CaNH$2(3DRzmpc5F$ z25Bb$hW zs9AG0X=X-+-D*;v%1gp&t;&ch(#(t`apG@c>ZK{|1VEL_s!0QI#khC(wMcub>$8V^ zn)p$>nb&q>a)WDQ3DUK$ol2AW z-*J`Sc7?}Lb-LIoB*T%hY z|Lz_>{tsPjvc0V`wUGcmJZX=WqGox!l-W>g{(Q`PDSxVKFKoXlt*saKoqo{{{lU7wj*?2T^U6$mbk%1( zXrf_1fg))tF+OA^#s(sS%GsGg1ulvwS^V(>00mGwP-c1JQP&2xNK?6RTOv%z6G0!C zNgIojihr3o@B0QT5q$0I*8!S)Um{?=Sqed}`?`~Z+~}m9yS%M^uRb)%Md2A0nEnCD zOg5Do(Kkwu_&(-UNviSBhN6rm$W}=eWzr@Qs9a!q5$~5pWbB8xB`9p^VWC7yoM}A# zfqi&_KZ_HOgSlQ06I6h6ja$}aW~?_C+^6xR&2fwh3DahFJTHZhnUPeI5QNdI7zQcJ zs-jL6ztZ(mS(qWfHkKZZa2*@60IrRoPv@_T8)$DV(&ve^3H2b!oA8`ajrF9o0g!L6 qCZ!F-X?ibZBACz*Wq$q%u>1?w_T3wNZQPdt0000hxRXgRpRRbipA9H^-fT}gg+J=?YJUI`i6@G_z<3yxPSYiq_NLB|aA?4U~znQC!qrc~5jsFhwXc=%S>NFq7oMcN#(O4QXe@RD?2vFG?DE*YE)N z&NYILo}0J-8SAuxJd{TBVVh!HbWXyiQP;$6Jf7HGpmQ4av>n8Cz94&okCoBx0*Nwd zhL3_n@+1xMv48!@GO_W=f$>9Khw&I*z=w5t>LWK{7qzka*28OM&cSw0l1`T`eu%K_ zxuI{$*7>y&X=L7D@8LSl;=tX=b^?77c*>X6Q6xfr+oflU2z*2*vqjb**1JOJli)Qp z;X6JT7>0U=?oHCwH)An=`l*hmX|{X=($LCKrY>Xx?0=lC+9ET_{koj7NNcQ9*XgQ{ zUm|KoaH@T2PRELiY%=;!ZK!AXoZXzno?`Qt zLW5e5XEbubKK)grv|u`JtMkh-w!tX`nNv%J?mO$=XKu9AT0&ZrhO)QFCw3sA$^`<& zM2MV?H-BhU*C|Ut>z7BJE*k;RwxQng((mUc|7;|Uq)XIBXqq8zBgxzBwjY#E`lRgYCD4ZeX}+POe`-06h+T{UAEefIu^-s%bW-d z|A5e@A{(9>Nf&uGPVz2VV}P@NHuMkn3DS5{A%6?cqysvE*wv6Q2BRoyZ3r$M*$ipe zTfgLlL?P}qp6Ww|jyw1Z-W3|+NGKsXgn#;~kB!pAoCzKqXU`p`BSH*VGAUn?H;xZ_ zzS&$jCCpmoF$lLT^X}3Ud<=VCPmy^GdjypE^vI4YvQ7#AECKo^37q=R#US(}#^#f1 z7)p}1oY{A_X22vbkLOnHy+X>se2=u0ih>rDg_^xbT0ydED(BSX$sTF7jBM(HGH+G? b1epE<*7n^Su%X5=00000NkvXXu0mjfh^L=> diff --git a/docs/html/userhtml1x.png b/docs/html/userhtml1x.png index 20f909a776854ab70e034e7242792bd12175c9e3..92bea69d4863cd45e2152a3fd36de9b589934e41 100644 GIT binary patch delta 1848 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 Hu0mjf$MfKk diff --git a/docs/html/userhtmlli2.html b/docs/html/userhtmlli2.html index 1f90786e..16534d55 100644 --- a/docs/html/userhtmlli2.html +++ b/docs/html/userhtmlli2.html @@ -189,7 +189,7 @@ class="cmr-12">  5.9.5 Method: freeMethod: deallocate_wrk
 
5.9.5 Method: freeMethod: deallocate_wrk

-

call p%free_wrk(info)
+

call p%deallocate_wrk(info)

diff --git a/docs/src/userinterface.tex b/docs/src/userinterface.tex index f2b3df1a..56a524ac 100644 --- a/docs/src/userinterface.tex +++ b/docs/src/userinterface.tex @@ -1026,10 +1026,10 @@ type of the \fortinline|x| argument to the \fortinline|apply| method. -\subsubsection{Method: free\_wrk} +\subsubsection{Method: deallocate\_wrk} \begin{center} -\fortinline|call p%free_wrk(info)|\\ +\fortinline|call p%deallocate_wrk(info)|\\ \end{center} \noindent diff --git a/samples/cuda/amg_dexample_cuda.F90 b/samples/cuda/amg_dexample_cuda.F90 index fd543427..c0a11e28 100644 --- a/samples/cuda/amg_dexample_cuda.F90 +++ b/samples/cuda/amg_dexample_cuda.F90 @@ -1285,7 +1285,7 @@ program amg_dexample_cuda t2 = psb_wtime() - t1 call psb_amx(ctxt,t2) - call prec%free_wrk(info) + call prec%deallocate_wrk(info) call psb_geall(r,desc_A,info) call r%zero()