From 72b42f519ec9c69c7fb4e39ba54f4bc68fc56a6a Mon Sep 17 00:00:00 2001
From: Wiarda <wiardada@ornl.gov>
Date: Tue, 2 Jun 2020 15:58:31 -0400
Subject: [PATCH] Address review comments
---
sammy/src/ang/mang1.f | 4 +--
sammy/src/ang/mang2.f | 2 +-
sammy/src/avg/mavg4.f | 4 +--
sammy/src/ccm/mccm1.F | 2 +-
sammy/src/clm/mclm3.f | 4 +--
sammy/src/clm/mclm8.f | 2 +-
sammy/src/clq/mclq1.f | 16 +++++-----
sammy/src/cro/mcro0.f | 10 +++---
sammy/src/cro/mcro1.f | 16 +++++-----
sammy/src/cro/mcro7.f | 22 ++++++-------
sammy/src/dat/mdat0.f90 | 17 +++-------
sammy/src/dat/mdat2.f90 | 10 +++---
sammy/src/dat/mdat4.f90 | 2 +-
sammy/src/dat/mdat9.f90 | 2 +-
sammy/src/dbd/mdbd1.f | 4 +--
sammy/src/dbd/mdbd2.f | 2 +-
sammy/src/dbd/mdbd3.f | 4 +--
sammy/src/dex/mdex1.f | 4 +--
sammy/src/dop/mdop1.f | 8 ++---
sammy/src/fgm/mfgm1.f | 6 ++--
sammy/src/grp/mgrp2.f | 6 ++--
sammy/src/grp/mgrp3.f | 2 +-
sammy/src/grp/mgrp4.f | 3 +-
sammy/src/int/mint0.f | 4 +--
sammy/src/int/mint1.f | 4 +--
sammy/src/int/mint2.f90 | 2 +-
sammy/src/int/mint3.f | 11 +++++--
sammy/src/int/mint6.f | 2 +-
sammy/src/mlb/mmlb1.f | 2 +-
sammy/src/mso/mmso2.f | 2 +-
sammy/src/mso/mmso4.f | 4 +--
sammy/src/mxw/mmxw5.f | 2 +-
sammy/src/npv/mnpv8.f | 4 +--
sammy/src/npv/mnpva.f | 2 +-
sammy/src/ntg/mntg3.f | 2 +-
sammy/src/ntg/mntg4.f | 4 +--
sammy/src/ntg/mntg6.f | 2 +-
sammy/src/ntg/mntg7.f | 2 +-
sammy/src/ntg/mntg8.f | 2 +-
sammy/src/ntg/mntga.f | 2 +-
sammy/src/odf/modf3.f90 | 4 +--
sammy/src/orr/morr1.f | 2 +-
sammy/src/orr/morr4.f | 4 +--
sammy/src/orr/morr5.f | 6 ++--
sammy/src/ort/mort1.f | 2 +-
sammy/src/ref/mref2.f | 2 +-
sammy/src/ref/mwrt1.f | 2 +-
sammy/src/rpi/mrpi1.f | 2 +-
sammy/src/rpi/mrpi5.f | 4 +--
sammy/src/rpi/mrpi6.f | 12 +++----
sammy/src/rpi/mrpi8.f | 2 +-
sammy/src/rpi/mrpi9.f | 12 +++----
sammy/src/rpt/mrpt1.f | 2 +-
sammy/src/rsl/mrsl0.f | 4 +--
sammy/src/rsl/mrsl3.f | 2 +-
sammy/src/rsl/mrsl6.f | 2 +-
sammy/src/rst/mrst1.f | 2 +-
sammy/src/salmon/SammyGridAccess.cpp | 4 +--
sammy/src/salmon/SammyGridAccess.h | 4 +--
.../interface/cix/SammyGridAccess.cpp2f.xml | 4 +--
.../cpp/SammyGridAccessInterface.cpp | 8 ++---
.../interface/cpp/SammyGridAccessInterface.h | 4 +--
.../interface/fortran/SammyGridAccess_I.f90 | 4 +--
.../interface/fortran/SammyGridAccess_M.f90 | 12 +++----
.../src/salmon/tests/SammyGridAccessTest.cpp | 32 +++++++++----------
sammy/src/smc/msmc1.f | 4 +--
sammy/src/ssm/mssm01.f90 | 2 +-
sammy/src/ssm/mssm03.f90 | 10 +++---
sammy/src/ssm/mssm04.f90 | 8 ++---
sammy/src/ssm/mssm05.f90 | 4 +--
sammy/src/ssm/mssm06.f90 | 4 +--
sammy/src/ssm/mssm07.f90 | 4 +--
sammy/src/ssm/mssm08.f90 | 4 +--
sammy/src/ssm/mssm09.f90 | 10 +++---
sammy/src/ssm/mssm18.f90 | 6 ++--
sammy/src/the/mthe1.f | 2 +-
sammy/src/udr/mudr1.f | 2 +-
sammy/src/udr/mudr4.f | 2 +-
sammy/src/xct/mxct0.f | 6 ++--
sammy/src/xct/mxct02.f | 2 +-
sammy/src/xct/mxct27.f90 | 2 +-
sammy/src/xxx/mxxx4.f | 2 +-
82 files changed, 207 insertions(+), 210 deletions(-)
diff --git a/sammy/src/ang/mang1.f b/sammy/src/ang/mang1.f
index 95857e666..137bea06c 100644
--- a/sammy/src/ang/mang1.f
+++ b/sammy/src/ang/mang1.f
@@ -46,10 +46,10 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
call auxGrid%initialize()
call auxGrid%setParameters(numcro, ktzero)
- call auxGrid%setAuxGrid(expData)
+ call auxGrid%setToAuxGrid(expData)
C
Kkkmin = 0
Need_Isotopes = Ydoppr
diff --git a/sammy/src/ang/mang2.f b/sammy/src/ang/mang2.f
index a220e490d..e9efa6a2a 100644
--- a/sammy/src/ang/mang2.f
+++ b/sammy/src/ang/mang2.f
@@ -87,7 +87,7 @@ C
N = Jjdat
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
Kkk = Kjatto - 1
DO Iangle=1,Nangle
Kkk = Kkk + 1
diff --git a/sammy/src/avg/mavg4.f b/sammy/src/avg/mavg4.f
index 8b48db391..2a5169da2 100644
--- a/sammy/src/avg/mavg4.f
+++ b/sammy/src/avg/mavg4.f
@@ -61,7 +61,7 @@ C * Emn(Ndatq), Emx(Ndatq), Deld(Ndatq), Delu(Ndatq)
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
Eeemin = (grid%getEnergy(1, expData)*Three-
@@ -190,7 +190,7 @@ C * Emn(Ndatq), Emx(Ndatq), Deld(Ndatq), Delu(Ndatq)
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
DO I=1,Kdat
diff --git a/sammy/src/ccm/mccm1.F b/sammy/src/ccm/mccm1.F
index f0a778fe3..b69bc209f 100755
--- a/sammy/src/ccm/mccm1.F
+++ b/sammy/src/ccm/mccm1.F
@@ -35,7 +35,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
C
N = Nnndat
C
diff --git a/sammy/src/clm/mclm3.f b/sammy/src/clm/mclm3.f
index c18f63539..7476b88cb 100644
--- a/sammy/src/clm/mclm3.f
+++ b/sammy/src/clm/mclm3.f
@@ -52,10 +52,10 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
call auxGrid%initialize()
call auxGrid%setParameters(numcro, ktzero)
- call auxGrid%setAuxGrid(expData)
+ call auxGrid%setToAuxGrid(expData)
numEl = grid%getNumEnergies(expData)
numElAux = auxGrid%getNumEnergies(expData)
diff --git a/sammy/src/clm/mclm8.f b/sammy/src/clm/mclm8.f
index 902af3d68..ac29e8ccc 100644
--- a/sammy/src/clm/mclm8.f
+++ b/sammy/src/clm/mclm8.f
@@ -38,7 +38,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
L1er = 0
L2er = 0
diff --git a/sammy/src/clq/mclq1.f b/sammy/src/clq/mclq1.f
index 55d5dfdad..4bc3072ab 100644
--- a/sammy/src/clq/mclq1.f
+++ b/sammy/src/clq/mclq1.f
@@ -30,24 +30,24 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
call auxGrid%initialize()
call auxGrid%setParameters(numcro, ktzero)
- call auxGrid%setAuxGrid(expData)
- numEl = grid%getNumEnergies(expData)
- numElAux = auxGrid%getNumEnergies(expData)
+ call auxGrid%setToAuxGrid(expData)
+ numE = grid%getNumEnergies(expData)
+ numEAux = auxGrid%getNumEnergies(expData)
Ndasig = 0
Ndbsig = 0
Ywhich = Ydoppr.OR.Yresol.OR.Yangle.OR.Yssmsc.OR.Yaverg
- CALL Zero_Array (Wsigxx, Nnnsig*Nnniso*numElAux)
+ CALL Zero_Array (Wsigxx, Nnnsig*Nnniso*numEAux)
C
Kkkkkk = 0
Kkkmin = 0
Ntype = 1
C
Eminxx = grid%getEnergy(1, expData)
- Emaxxx = grid%getEnergy(numEl, expData)
+ Emaxxx = grid%getEnergy(numE, expData)
C
Em = Zero
A0 = Zero
@@ -141,7 +141,7 @@ C cross section is a function of time
END IF
C
IF (Kkkclq.EQ.4) THEN
- DO Jdat=1,numElAux
+ DO Jdat=1,numEAux
IF (auxGrid%getEnergy(Jdat, expData).GE.Em) THEN
Jmid = Jdat
GO TO 10
@@ -175,7 +175,7 @@ C
C
C
C
- DO Jdat=1,numElAux
+ DO Jdat=1,numEAux
Jjdat = Jdat
Su = auxGrid%getEnergy(Jdat, expData)
IF (Kkkdop.NE.1 .OR. Su.GT.Zero) THEN
diff --git a/sammy/src/cro/mcro0.f b/sammy/src/cro/mcro0.f
index 3c7964043..cfe778897 100644
--- a/sammy/src/cro/mcro0.f
+++ b/sammy/src/cro/mcro0.f
@@ -227,8 +227,8 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
- numEl = grid%getNumEnergies(expData)
+ call grid%setToAuxGrid(expData)
+ numE = grid%getNumEnergies(expData)
Na = 1
Nb = 1
IF (Kshift.NE.0) Na = Nres
@@ -246,9 +246,9 @@ C
N4 = 1
END IF
N6 = 1
- IF (Kpiece.EQ.1) N6 = numEl*Ngroup
+ IF (Kpiece.EQ.1) N6 = numE*Ngroup
N8 = 1
- IF (Kpiece.EQ.1) N8 = numEl
+ IF (Kpiece.EQ.1) N8 = numE
C
C *** one ***
CALL Figure_Kws_Cro (Kone)
@@ -289,7 +289,7 @@ C
K = Idimen (K, 1, 'K, 1')
I = Idimen (K, -1, 'K, -1')
I = Idimen (0, 0, '0, 0')
- Ndatmx = numEl
+ Ndatmx = numE
Ndatmn = 1
call grid%destroy()
RETURN
diff --git a/sammy/src/cro/mcro1.f b/sammy/src/cro/mcro1.f
index 115054d72..803806f98 100644
--- a/sammy/src/cro/mcro1.f
+++ b/sammy/src/cro/mcro1.f
@@ -42,21 +42,21 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
- numEl = grid%getNumEnergies(expData)
+ call grid%setToAuxGrid(expData)
+ numE = grid%getNumEnergies(expData)
C
Ywhich = Ydoppr.OR.Yresol
CALL Zero_Cross_Sections (Theory, Wsigxx, Wdasig, Wdbsig, Sigxxx,
- * Sigxxx, Sigxxx, 0, numEl, 0)
+ * Sigxxx, Sigxxx, 0, numE, 0)
CALL Zero_Integer (Isopar, Ndasig)
C
- IF (Kpiece.EQ.1) CALL Zero_Array (Pieces, Ngroup*numEl)
+ IF (Kpiece.EQ.1) CALL Zero_Array (Pieces, Ngroup*numE)
Kkkkkk = 0
Kkkmin = 0
C
C *** Calculate cross sections and derivatives for all
C *** positive energies
- DO 110 J=1,numEl
+ DO 110 J=1,numE
Jdat = J
CALL Zero_Array (Sigxxx, Nnnsig*Nnniso)
IF (Ndasig.GT.0) CALL Zero_Array (Dasigx, Nnnsig*Ndasig)
@@ -70,7 +70,7 @@ C
IF (Su.LT.Zero) Su = - Su
Squ = dSQRT(Su)
Ipoten = 0
- IF (Kpoten.NE.0 .AND. (J.EQ.1 .OR. J.EQ.numEl)) THEN
+ IF (Kpoten.NE.0 .AND. (J.EQ.1 .OR. J.EQ.numE)) THEN
10000 FORMAT(/, ' Potential Scattering for energy',
* 1PE13.6, /,
* ' group l for this group for this l')
@@ -95,7 +95,7 @@ C *** add endf/b file 3 to cross sections
Gbx = Zero
CALL Adcros (grid%getEnergy(Jdat, expData),
* Gbx, Adderg, Addcro,
- * Nbt, Int, Nrfil3, Npfil3, Jdat, numEl)
+ * Nbt, Int, Nrfil3, Npfil3, Jdat, numE)
Sigxxx(1,1) = Sigxxx(1,1) + Gbx
END IF
C
@@ -168,7 +168,7 @@ C
IF (Ywhich .OR. Maxwel.EQ.1 .OR. Knocor.EQ.1) THEN
Kkkmin = Kkkmin - 1
CALL Write_Cross_Sections (Wsigxx, Wdasig, Wdbsig,
- * Sigxxx, Sigxxx, Sigxxx, Nnnsig, numEl, Kkkmin, 0)
+ * Sigxxx, Sigxxx, Sigxxx, Nnnsig, numE, Kkkmin, 0)
END IF
C
IF (Kpiece.EQ.1) CALL Odfpcs (Dum, Pieces)
diff --git a/sammy/src/cro/mcro7.f b/sammy/src/cro/mcro7.f
index 67474a8a2..e824bafa0 100755
--- a/sammy/src/cro/mcro7.f
+++ b/sammy/src/cro/mcro7.f
@@ -17,15 +17,15 @@ C E(ndatb), Pieces(Ngroup,ndatb)
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
- numEl = grid%getNumEnergies(expData)
+ call grid%setToAuxGrid(expData)
+ numE = grid%getNumEnergies(expData)
IF (Odfmul.EQ.0.0d0 .OR. Odfmul.EQ.1.0d0) THEN
- DO I=1,numEl
+ DO I=1,numE
E(I) = grid%getEnergy(I, expData)
END DO
Kk = 1
ELSE
- DO I=1,numEl
+ DO I=1,numE
E(I) = grid%getEnergy(I, expData)*Odfmul
END DO
Kk = 3
@@ -35,19 +35,19 @@ C
Numodf = 71
New = 1
Nsect = Ngroup + 2
- CALL Pltio (Numodf, 'sammy.pcs ', New, Nsect, numEl, Kk)
+ CALL Pltio (Numodf, 'sammy.pcs ', New, Nsect, numE, Kk)
C
Nwhere = 1
Isn = 1
- CALL Pltout (Numodf, Nsect, Isn, Nwhere, numEl, E, 1)
- DO I=1,numEl
+ CALL Pltout (Numodf, Nsect, Isn, Nwhere, numE, E, 1)
+ DO I=1,numE
E(I) = Pieces(Ngroup,I)
END DO
Isn = 2
- CALL Pltout (Numodf, Nsect, Isn, Nwhere, numEl, E, 1)
+ CALL Pltout (Numodf, Nsect, Isn, Nwhere, numE, E, 1)
C
IF (Ngroup.GT.1) THEN
- DO K=1,numEl
+ DO K=1,numE
N = Ngroup
DO Igroup=2,Ngroup
Pieces(N,K) = Pieces(N,K) - Pieces(N-1,K)
@@ -58,10 +58,10 @@ C
C
DO Igroup=1,Ngroup
Isn = Igroup + 2
- DO I=1,numEl
+ DO I=1,numE
E(I) = Pieces(Igroup,i)
END DO
- CALL Pltout (Numodf, Nsect, Isn, Nwhere, numEl, E, 1)
+ CALL Pltout (Numodf, Nsect, Isn, Nwhere, numE, E, 1)
END DO
C
CALL Plt_Close (Numodf)
diff --git a/sammy/src/dat/mdat0.f90 b/sammy/src/dat/mdat0.f90
index ebef7d6c8..ca5703685 100644
--- a/sammy/src/dat/mdat0.f90
+++ b/sammy/src/dat/mdat0.f90
@@ -122,19 +122,10 @@ module Samdat_0_M
call grid%initialize()
indat = 1
- if (Ktzero.NE.0) then
- if ( Numcro.gt.1) then
- call grid%setDataIndex(4)
- else
- call grid%setDataIndex(3)
- end if
- else
- if (Numcro.gt.1) then
- call grid%setDataIndex(3)
- else
- call grid%setDataIndex(2)
- end if
- end if
+ minDataIndex = 2
+ if(Ktzero.NE.0) minDataIndex = minDataIndex + 1
+ if(Numcro.gt.1) minDataIndex = minDataIndex + 1
+ call grid%setDataIndex(minDataIndex)
do i = 1, Ndat
ee = A_Ienerg(i)
etzero = ee
diff --git a/sammy/src/dat/mdat2.f90 b/sammy/src/dat/mdat2.f90
index 1144369ef..71dbdbff1 100644
--- a/sammy/src/dat/mdat2.f90
+++ b/sammy/src/dat/mdat2.f90
@@ -1110,8 +1110,8 @@ module mdat2_m
call gridAccess%initialize()
call gridAccess%setParameters(numcro, ktzero)
- call gridAccess%setExpGrid(expData)
- numEl = gridAccess%getNumEnergies(expData)
+ call gridAccess%setToExpGrid(expData)
+ numE = gridAccess%getNumEnergies(expData)
!
! *** Initialize the Plot File
Nsntyp = 11
@@ -1136,12 +1136,12 @@ module mdat2_m
IF (Keveng.NE.1) THEN
- call reallocate_real_data(Energy, numEl)
- DO I=1,numEl
+ call reallocate_real_data(Energy, numE)
+ DO I=1,numE
Energy(I) = gridAccess%getEnergy(I, expData) * Ooo
END DO
CALL Pltout (72, Nsntyp, 1, 1, Ndat, Energy, 1)
- DO I=1,numEl
+ DO I=1,numE
Energy(I) = gridAccess%getEnergy(I, expData)
END DO
ELSE
diff --git a/sammy/src/dat/mdat4.f90 b/sammy/src/dat/mdat4.f90
index ac0e66282..c5bf13825 100644
--- a/sammy/src/dat/mdat4.f90
+++ b/sammy/src/dat/mdat4.f90
@@ -172,7 +172,7 @@ contains
! *** Here there's really no broadening
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
numEl = grid%getNumEnergies(expData)
DO I=1,numEl
diff --git a/sammy/src/dat/mdat9.f90 b/sammy/src/dat/mdat9.f90
index 3d8634ce9..8e3a2e84a 100755
--- a/sammy/src/dat/mdat9.f90
+++ b/sammy/src/dat/mdat9.f90
@@ -125,7 +125,7 @@ module mdat9_m
N = istart
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
IF (E.GT.grid%getEnergy(istart, expData)) THEN
N = Nn - 1
diff --git a/sammy/src/dbd/mdbd1.f b/sammy/src/dbd/mdbd1.f
index 953220248..d715c2974 100644
--- a/sammy/src/dbd/mdbd1.f
+++ b/sammy/src/dbd/mdbd1.f
@@ -48,10 +48,10 @@ C *** Brdlim is now set in segment DAT
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
call auxGrid%initialize()
call auxGrid%setParameters(numcro, ktzero)
- call auxGrid%setAuxGrid(expData)
+ call auxGrid%setToAuxGrid(expData)
C
C
C *** FORM DOPPLER-BROADENED CROSS SECTION, STORE IN Wg..
diff --git a/sammy/src/dbd/mdbd2.f b/sammy/src/dbd/mdbd2.f
index e28a0c832..f9fa6e0c3 100644
--- a/sammy/src/dbd/mdbd2.f
+++ b/sammy/src/dbd/mdbd2.f
@@ -17,7 +17,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
Nn = Kdatb - 3
Nnp2 = Kdatb - 1
diff --git a/sammy/src/dbd/mdbd3.f b/sammy/src/dbd/mdbd3.f
index a99bb2c1d..c261d001d 100644
--- a/sammy/src/dbd/mdbd3.f
+++ b/sammy/src/dbd/mdbd3.f
@@ -16,7 +16,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
Ilow = Kc - 1
10 Ilow = Ilow + 1
@@ -47,7 +47,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
Jwhich = 0
e1 = grid%getEnergy(Ipnts+Kc-1, expData)
diff --git a/sammy/src/dex/mdex1.f b/sammy/src/dex/mdex1.f
index 990519c0f..f7a015397 100644
--- a/sammy/src/dex/mdex1.f
+++ b/sammy/src/dex/mdex1.f
@@ -48,10 +48,10 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
call auxGrid%initialize()
call auxGrid%setParameters(numcro, ktzero)
- call auxGrid%setAuxGrid(expData)
+ call auxGrid%setToAuxGrid(expData)
C
IF (K2reso.EQ.1 .AND. (Numorr.GT.0 .OR. Numrpi.GT.0) ) THEN
Number_D = Kdatb
diff --git a/sammy/src/dop/mdop1.f b/sammy/src/dop/mdop1.f
index ce89d4051..a77f77826 100644
--- a/sammy/src/dop/mdop1.f
+++ b/sammy/src/dop/mdop1.f
@@ -48,7 +48,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
K2pls1 = M2pls1
Nnn = Ngb
@@ -274,15 +274,15 @@ C
END DO
END IF
END IF
- iposJJ = (Jj - 1) * numco + 1 ! all energies for each numcro are the same
- iposJ = (Jj - 1) * numco + 1
+ iposJJ = (Jj - 1) * numcro + 1 ! all energies for each numcro are the same
+ iposJ = (Jj - 1) * numcro + 1
ee = grid%getData(iposJ, 1)
do Jjnum = iposJJ, iposJJ + Numcro -1
call grid%addData( Jjnum, 1, ee)
end do
J = J - 1
END DO
- iposJJ = (Ngtvv - 1) * numco + 1 ! all energies for each numcro are the same
+ iposJJ = (Ngtvv - 1) * numcro + 1 ! all energies for each numcro are the same
do Jjnum = iposJJ, iposJJ + Numcro -1
call grid%addData( Jjnum, 1, 0.0d0)
end do
diff --git a/sammy/src/fgm/mfgm1.f b/sammy/src/fgm/mfgm1.f
index fdf049f9e..0aa405338 100644
--- a/sammy/src/fgm/mfgm1.f
+++ b/sammy/src/fgm/mfgm1.f
@@ -14,7 +14,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
J = 1
IF (grid%getEnergy(1, expData).GT.Zero) THEN
@@ -96,10 +96,10 @@ C *** Brdlim now set in segment DAT
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
call auxGrid%initialize()
call auxGrid%setParameters(numcro, ktzero)
- call auxGrid%setAuxGrid(expData)
+ call auxGrid%setToAuxGrid(expData)
C
C
C *** FORM DOPPLER-BROADENED CROSS SECTION, STORE IN X5.
diff --git a/sammy/src/grp/mgrp2.f b/sammy/src/grp/mgrp2.f
index 7c009522b..e5ec20964 100755
--- a/sammy/src/grp/mgrp2.f
+++ b/sammy/src/grp/mgrp2.f
@@ -17,7 +17,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
Ilow = Kc - 1
IF (Ilow.LT.0) Ilow = 0
@@ -49,7 +49,7 @@ C
use fixedi_m
use ifwrit_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
- DIMENSIONVsigxx(Nnnsig,*), Vdasig(Nnnsig,Ndasig,*),
+ DIMENSION Vsigxx(Nnnsig,*), Vdasig(Nnnsig,Ndasig,*),
* Vdbsig(Nnnsig,Ndbsig,*), Fintgr(1,Ngbxxx,*)
C
DO I=1,Kdatb
@@ -89,7 +89,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
Kbonda = 0
DO I=1,Kdatb
diff --git a/sammy/src/grp/mgrp3.f b/sammy/src/grp/mgrp3.f
index ebe9b45a5..c24963a32 100644
--- a/sammy/src/grp/mgrp3.f
+++ b/sammy/src/grp/mgrp3.f
@@ -44,7 +44,7 @@ C *** issues warning, and redefines limits (also redefines
C *** Ndatq, if needed).
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
elow = grid%getEnergy(1, expData)
ehigh = grid%getEnergy(Kdatb, expData)
CALL Testee (elow, ehigh, Kmn, Kmx, Emn, Emx, Ndatq)
diff --git a/sammy/src/grp/mgrp4.f b/sammy/src/grp/mgrp4.f
index 2d9a1de03..20a1b8fc9 100755
--- a/sammy/src/grp/mgrp4.f
+++ b/sammy/src/grp/mgrp4.f
@@ -21,7 +21,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
CALL Zero_Array (Wts, Kdatb)
J = Kmx - Kmn + 1
C
@@ -479,6 +479,7 @@ C *** Here Kmx = Kmn + 2
ekmn1 = grid%getEnergy(Kmn + 1, expData)
CALL Yone (grid, ekmn, ekmn1, Wts, 1)
ELSE
+ e1 = grid%getEnergy(Kmn, expData)
e2 = grid%getEnergy(Kmn + 1, expData)
CALL Ytwo (grid, e1, e2, Wts, 1)
END IF
diff --git a/sammy/src/int/mint0.f b/sammy/src/int/mint0.f
index cbf58a940..e02ccf716 100644
--- a/sammy/src/int/mint0.f
+++ b/sammy/src/int/mint0.f
@@ -159,7 +159,7 @@ C - - - - - - - - - - - - - >
call gridAccess%initialize()
call gridAccess%setParameters(numcro, ktzero)
- call gridAccess%setAuxGrid(expData)
+ call gridAccess%setToAuxGrid(expData)
C
C *** Read the cross sections etc
Jgbmax = 0
@@ -274,7 +274,7 @@ C
N = Ndat
call gridAccess%initialize()
call gridAccess%setParameters(numcro, ktzero)
- call gridAccess%setExpGrid(expData)
+ call gridAccess%setToExpGrid(expData)
C
c
c *********************************
diff --git a/sammy/src/int/mint1.f b/sammy/src/int/mint1.f
index 72ba59de8..a198b46b4 100644
--- a/sammy/src/int/mint1.f
+++ b/sammy/src/int/mint1.f
@@ -36,10 +36,10 @@ C
call auxGrid%initialize()
call auxGrid%setParameters(numcro, ktzero)
- call auxGrid%setAuxGrid(expData)
+ call auxGrid%setToAuxGrid(expData)
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
C
IF (Kkknew.LT.1) THEN
WRITE (21,30000)
diff --git a/sammy/src/int/mint2.f90 b/sammy/src/int/mint2.f90
index 69c9dc732..ce55d2256 100644
--- a/sammy/src/int/mint2.f90
+++ b/sammy/src/int/mint2.f90
@@ -353,7 +353,7 @@ module mint2_m
CALL Newopn (59, File, 0)
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
DO J=1,Ndat
WRITE (59,10000) grid%getEnergy(J, expData), Data(J)
10000 FORMAT (2F20.10)
diff --git a/sammy/src/int/mint3.f b/sammy/src/int/mint3.f
index b771226bd..c77adc547 100644
--- a/sammy/src/int/mint3.f
+++ b/sammy/src/int/mint3.f
@@ -31,7 +31,7 @@ C
Input = 0
call gridAccess%initialize()
call gridAccess%setParameters(numcro, ktzero)
- call gridAccess%setExpGrid(expData)
+ call gridAccess%setToExpGrid(expData)
IF (Nblock.LT.Ndat) WRITE (6,10010) Nblock, Ndat
10010 FORMAT (' Possible problem with ODF file; Nblock,Ndat=', 2I8)
C
@@ -261,7 +261,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
DO I=1,Ndat
Se = dSQRT(grid%getEnergy(I, expData))
@@ -282,6 +282,11 @@ C
C
C *** Purpose -- Generate the plot file for unbroadened theoretical cross
C *** sections
+C
+C NumSect is the parameter passed in for the number of angles per energy point
+C Unfortunately this value can be different from the numcro set in fixedi_m,
+C which we need to set the values for SammyGridAccess.
+C
use modf3_M
use EndfData_common_m
use ifwrit_m, only : ktzero
@@ -295,7 +300,7 @@ C *** sections
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
cx Input = 0
Nsntyp = 1 + NumSect
diff --git a/sammy/src/int/mint6.f b/sammy/src/int/mint6.f
index 9c7433778..f287dfe1b 100644
--- a/sammy/src/int/mint6.f
+++ b/sammy/src/int/mint6.f
@@ -34,7 +34,7 @@ C *** Here when using Leal-Hwang so need to interpolate to present results
call gridAccess%initialize()
call gridAccess%setParameters(numcro, ktzero)
- call gridAccess%setExpGrid(expData)
+ call gridAccess%setToExpGrid(expData)
C
C *** Read the cross sections etc
Jgbmax = 0
diff --git a/sammy/src/mlb/mmlb1.f b/sammy/src/mlb/mmlb1.f
index a81f8caa6..963f7544c 100644
--- a/sammy/src/mlb/mmlb1.f
+++ b/sammy/src/mlb/mmlb1.f
@@ -106,7 +106,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
numEl = grid%getNumEnergies(expData)
Ywhich = Ydoppr.OR.Yresol
CALL Zero_Array (Wsigxx, Nnniso*numEl)
diff --git a/sammy/src/mso/mmso2.f b/sammy/src/mso/mmso2.f
index 286a69e2d..13055bdc2 100644
--- a/sammy/src/mso/mmso2.f
+++ b/sammy/src/mso/mmso2.f
@@ -60,7 +60,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
Itimes = 1
Kountr = 0
diff --git a/sammy/src/mso/mmso4.f b/sammy/src/mso/mmso4.f
index fd73de466..95b4e2d28 100755
--- a/sammy/src/mso/mmso4.f
+++ b/sammy/src/mso/mmso4.f
@@ -84,7 +84,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
IF (Idone.EQ.3 .AND. Ientrp.EQ.0) RETURN
C
@@ -219,7 +219,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
IF (Ientrp.NE.0) THEN
Ii = Ientrp
diff --git a/sammy/src/mxw/mmxw5.f b/sammy/src/mxw/mmxw5.f
index c72d65d4d..d2cd1e8d7 100644
--- a/sammy/src/mxw/mmxw5.f
+++ b/sammy/src/mxw/mmxw5.f
@@ -39,7 +39,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
Tosp = 2.0d0/Sqrtpi
Aaa = 4.0d0*Sqrtpi*Pi/100000.d0/(Twomhb)**2
diff --git a/sammy/src/npv/mnpv8.f b/sammy/src/npv/mnpv8.f
index 79f3f7458..df6975834 100644
--- a/sammy/src/npv/mnpv8.f
+++ b/sammy/src/npv/mnpv8.f
@@ -32,7 +32,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
ienum = grid%getNumEnergies(expData)
Do I = 1, ienum
Energy(I) = grid%getOrigEnergy(I, expData)
@@ -137,7 +137,7 @@ C
ELSE IF (A.EQ.'FREE FORMA') THEN
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
ienum = grid%getNumEnergies(expData)
Do I = 1, ienum
Energy(I) = grid%getOrigEnergy(I, expData)
diff --git a/sammy/src/npv/mnpva.f b/sammy/src/npv/mnpva.f
index d543681c5..94cae9490 100644
--- a/sammy/src/npv/mnpva.f
+++ b/sammy/src/npv/mnpva.f
@@ -18,7 +18,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
ienum = grid%getNumEnergies(expData)
Do I = 1, ienum
Energy(I) = grid%getOrigEnergy(I, expData)
diff --git a/sammy/src/ntg/mntg3.f b/sammy/src/ntg/mntg3.f
index 5930c5580..54bc2a863 100644
--- a/sammy/src/ntg/mntg3.f
+++ b/sammy/src/ntg/mntg3.f
@@ -17,7 +17,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C *** J = 1 thermal cross section
J = 1
diff --git a/sammy/src/ntg/mntg4.f b/sammy/src/ntg/mntg4.f
index 67d233f0c..307d0090f 100644
--- a/sammy/src/ntg/mntg4.f
+++ b/sammy/src/ntg/mntg4.f
@@ -35,7 +35,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C *** figure which energy is just below E1=.00001 eV and E2=3 eV
E1 = 0.00001d0
@@ -411,7 +411,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C *** figure which energy is just below E1=.00001 eV and E2=3 eV
E1 = 0.00001d0
diff --git a/sammy/src/ntg/mntg6.f b/sammy/src/ntg/mntg6.f
index c5ead32bc..2ae6f4865 100644
--- a/sammy/src/ntg/mntg6.f
+++ b/sammy/src/ntg/mntg6.f
@@ -31,7 +31,7 @@ C
Ipnts = Kdatb
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C *** figure which energies are just below bEgin and Equit
bEgin = 0.5d0
diff --git a/sammy/src/ntg/mntg7.f b/sammy/src/ntg/mntg7.f
index 4c89419d0..568c93482 100644
--- a/sammy/src/ntg/mntg7.f
+++ b/sammy/src/ntg/mntg7.f
@@ -33,7 +33,7 @@ C
Ipnts = Kdatb
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C *** figure which energies are just below bEgin and Equit
bEgin = Const(1,Kountr)
diff --git a/sammy/src/ntg/mntg8.f b/sammy/src/ntg/mntg8.f
index 9fde2602d..dc3e98a9b 100644
--- a/sammy/src/ntg/mntg8.f
+++ b/sammy/src/ntg/mntg8.f
@@ -34,7 +34,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C *** figure which energy is just below bEgin=1e-5 eV
bEgin = 0.00001d0
diff --git a/sammy/src/ntg/mntga.f b/sammy/src/ntg/mntga.f
index 9ec9aa98d..4f2094802 100644
--- a/sammy/src/ntg/mntga.f
+++ b/sammy/src/ntg/mntga.f
@@ -34,7 +34,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
Ipnts = Kdatb
Tosp = Two/Sqrtpi
diff --git a/sammy/src/odf/modf3.f90 b/sammy/src/odf/modf3.f90
index da8c52e7a..9d0f09781 100755
--- a/sammy/src/odf/modf3.f90
+++ b/sammy/src/odf/modf3.f90
@@ -444,7 +444,7 @@ contains
END SUBROUTINE Find_File_F
!!
-!! Helper functions to allow to use ebergy grids as arrays
+!! Helper functions to allow to use energy grids as arrays
!!
real(kind=8) function auxEArray (i) result(data)
use EndfData_common_m
@@ -457,7 +457,7 @@ contains
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
data = grid%getEnergy(i, expData)
diff --git a/sammy/src/orr/morr1.f b/sammy/src/orr/morr1.f
index 493454b58..882a4913b 100644
--- a/sammy/src/orr/morr1.f
+++ b/sammy/src/orr/morr1.f
@@ -47,7 +47,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
C
CALL Zero_Cross_Sections (Theory, Wsigxx, Wdasig, Wdbsig, Sigxxx,
* Sigxxx, Sigxxx, Kdat, Kdat, 0)
diff --git a/sammy/src/orr/morr4.f b/sammy/src/orr/morr4.f
index 204323ae4..3722b5165 100644
--- a/sammy/src/orr/morr4.f
+++ b/sammy/src/orr/morr4.f
@@ -54,7 +54,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
C *** initialize *** find time-independent quantities
@@ -436,7 +436,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
DO Ie=1,Ipnts
Sum = Zero
diff --git a/sammy/src/orr/morr5.f b/sammy/src/orr/morr5.f
index 21f8894c1..32151d754 100644
--- a/sammy/src/orr/morr5.f
+++ b/sammy/src/orr/morr5.f
@@ -28,7 +28,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
C *** intiialize
@@ -199,7 +199,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
C *** initialize
@@ -300,7 +300,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
C *** intiialize
diff --git a/sammy/src/ort/mort1.f b/sammy/src/ort/mort1.f
index 40394dbe0..52ef43954 100755
--- a/sammy/src/ort/mort1.f
+++ b/sammy/src/ort/mort1.f
@@ -82,7 +82,7 @@ C un-normalize !
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
Nsn = 3
New = 1
diff --git a/sammy/src/ref/mref2.f b/sammy/src/ref/mref2.f
index 5f59b8478..a184a0406 100644
--- a/sammy/src/ref/mref2.f
+++ b/sammy/src/ref/mref2.f
@@ -19,7 +19,7 @@ C
DIMENSION Data(*), dData(*)
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
Jcros = Kcros
Jtrans = Ktrans
Isn = 0
diff --git a/sammy/src/ref/mwrt1.f b/sammy/src/ref/mwrt1.f
index 741dd0083..e24d12074 100644
--- a/sammy/src/ref/mwrt1.f
+++ b/sammy/src/ref/mwrt1.f
@@ -192,7 +192,7 @@ C
DIMENSION Data(*), Unc(*)
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
OPEN (UNIT=10, FILE='SAMMY.DAT', STATUS='unknown',
* FORM='formatted')
DO 10 I=1,Ndat
diff --git a/sammy/src/rpi/mrpi1.f b/sammy/src/rpi/mrpi1.f
index 89e373590..1b318ab6d 100644
--- a/sammy/src/rpi/mrpi1.f
+++ b/sammy/src/rpi/mrpi1.f
@@ -48,7 +48,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
Iwarn = 0
Iff_Wts = 0
diff --git a/sammy/src/rpi/mrpi5.f b/sammy/src/rpi/mrpi5.f
index 75d09b117..7a9f074f9 100644
--- a/sammy/src/rpi/mrpi5.f
+++ b/sammy/src/rpi/mrpi5.f
@@ -27,7 +27,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
debug=.false.
if(emxxxx.gt.999.58.and.emxxxx.lt.999.650)debug=.true.
@@ -158,7 +158,7 @@ C *** initialize
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
Aw = Aaa/Www
TwoG = (Aaa/Www)*Half/Www
diff --git a/sammy/src/rpi/mrpi6.f b/sammy/src/rpi/mrpi6.f
index 99d710cf2..b7e256f23 100644
--- a/sammy/src/rpi/mrpi6.f
+++ b/sammy/src/rpi/mrpi6.f
@@ -28,7 +28,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
C *** initialize
@@ -324,7 +324,7 @@ C *** initialize
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
Allmax = Zero
C *** do loop over energies
@@ -383,7 +383,7 @@ C Weight(Kdatb), Wts(Ipnts)
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
C *** initialize
@@ -479,7 +479,7 @@ C
DATA Zero /0.0d0/, Two /2.0d0/
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
C *** initialize
@@ -550,7 +550,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
C *** initialize
@@ -698,7 +698,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
C *** initialize
diff --git a/sammy/src/rpi/mrpi8.f b/sammy/src/rpi/mrpi8.f
index 5846d3fa7..e83be7298 100644
--- a/sammy/src/rpi/mrpi8.f
+++ b/sammy/src/rpi/mrpi8.f
@@ -67,7 +67,7 @@ C *** initialize
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
CALL Zero_Array (Wtsx, Ipnts)
diff --git a/sammy/src/rpi/mrpi9.f b/sammy/src/rpi/mrpi9.f
index a4d736303..27bcae001 100644
--- a/sammy/src/rpi/mrpi9.f
+++ b/sammy/src/rpi/mrpi9.f
@@ -34,7 +34,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C *** initialize
CALL Zero_Array (Wtsx, Ipnts)
@@ -301,7 +301,7 @@ C *** initialize
CALL Zero_Array (Wts, Ipnts)
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
Summax = Zero
C *** do loop over energies
@@ -348,7 +348,7 @@ C
END IF
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C *** initialize
CALL Zero_Array (Wts, Ipnts)
@@ -442,7 +442,7 @@ C
CALL Zero_Array (Wtsx, Ipnts)
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
DO Ie=1,Ipnts
eIe = grid%getEnergy(Ie+Kc-1, expData)
Time = Ttoe/dSQRT(eIe)
@@ -518,7 +518,7 @@ C
END IF
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C *** initialize
CALL Zero_Array (Wts, Ipnts)
@@ -667,7 +667,7 @@ C
END IF
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C *** initialize
CALL Zero_Array (Wts, Ipnts)
diff --git a/sammy/src/rpt/mrpt1.f b/sammy/src/rpt/mrpt1.f
index 36dbec29a..c3099aa88 100644
--- a/sammy/src/rpt/mrpt1.f
+++ b/sammy/src/rpt/mrpt1.f
@@ -104,7 +104,7 @@ C un-normalize !
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C normalize for comparison to components of resolution function
C *** ELectron Burst, Target-Detector, ANd/or CHannel width?
diff --git a/sammy/src/rsl/mrsl0.f b/sammy/src/rsl/mrsl0.f
index 2e628a210..9cc4e2e59 100644
--- a/sammy/src/rsl/mrsl0.f
+++ b/sammy/src/rsl/mrsl0.f
@@ -47,10 +47,10 @@ C
call eGrid%initialize()
call eGrid%setParameters(numcro, ktzero)
- call eGrid%setExpGrid(expData)
+ call eGrid%setToExpGrid(expData)
call auxGrid%initialize()
call auxGrid%setParameters(numcro, ktzero)
- call auxGrid%setAuxGrid(expData)
+ call auxGrid%setToAuxGrid(expData)
C
CALL Set_Kws
C
diff --git a/sammy/src/rsl/mrsl3.f b/sammy/src/rsl/mrsl3.f
index 1dadd85ff..1617b4cec 100644
--- a/sammy/src/rsl/mrsl3.f
+++ b/sammy/src/rsl/mrsl3.f
@@ -22,7 +22,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
Now = Now + 1
I1 = Ienpk + 1
diff --git a/sammy/src/rsl/mrsl6.f b/sammy/src/rsl/mrsl6.f
index c70f31bd9..af770f185 100644
--- a/sammy/src/rsl/mrsl6.f
+++ b/sammy/src/rsl/mrsl6.f
@@ -16,7 +16,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
Ilow = KC - 1
C
diff --git a/sammy/src/rst/mrst1.f b/sammy/src/rst/mrst1.f
index 5c215f5eb..3eabe96d6 100644
--- a/sammy/src/rst/mrst1.f
+++ b/sammy/src/rst/mrst1.f
@@ -128,7 +128,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C
C
C
diff --git a/sammy/src/salmon/SammyGridAccess.cpp b/sammy/src/salmon/SammyGridAccess.cpp
index a5fa0c90d..4e0c84cb1 100644
--- a/sammy/src/salmon/SammyGridAccess.cpp
+++ b/sammy/src/salmon/SammyGridAccess.cpp
@@ -8,12 +8,12 @@ namespace sammy {
if (this->numcro == 0) this->numcro = 1;
}
- void SammyGridAccess::setExpGrid(const GridDataList & list){
+ void SammyGridAccess::setToExpGrid(const GridDataList & list){
gridIndex = list.getExpGridIndex();
}
- void SammyGridAccess::setAuxGrid(const GridDataList & list){
+ void SammyGridAccess::setToAuxGrid(const GridDataList & list){
gridIndex = list.getAuxGridIndex();
}
diff --git a/sammy/src/salmon/SammyGridAccess.h b/sammy/src/salmon/SammyGridAccess.h
index 574b7e5b6..ccbe49e26 100644
--- a/sammy/src/salmon/SammyGridAccess.h
+++ b/sammy/src/salmon/SammyGridAccess.h
@@ -42,13 +42,13 @@ namespace sammy{
* Indicate that this access is for the experimental grid
* @param list the container for the underlying grids
*/
- void setExpGrid(const GridDataList & list);
+ void setToExpGrid(const GridDataList & list);
/**
* Indicate that this access is for the auxillary grid
* @param list the container for the underlying grids
*/
- void setAuxGrid(const GridDataList & list);
+ void setToAuxGrid(const GridDataList & list);
/**
* Get the energy at the desired index.
diff --git a/sammy/src/salmon/interface/cix/SammyGridAccess.cpp2f.xml b/sammy/src/salmon/interface/cix/SammyGridAccess.cpp2f.xml
index c09d617a1..aa98d68f0 100644
--- a/sammy/src/salmon/interface/cix/SammyGridAccess.cpp2f.xml
+++ b/sammy/src/salmon/interface/cix/SammyGridAccess.cpp2f.xml
@@ -7,10 +7,10 @@
<param name="numcro" type="int"/>
<param name="ktzero" type="int"/>
</method>
- <method name="setExpGrid">
+ <method name="setToExpGrid">
<param name="list" type="GridDataList"/>
</method>
- <method name="setAuxGrid">
+ <method name="setToAuxGrid">
<param name="list" type="GridDataList"/>
</method>
<method name="getEnergy" return_type="double">
diff --git a/sammy/src/salmon/interface/cpp/SammyGridAccessInterface.cpp b/sammy/src/salmon/interface/cpp/SammyGridAccessInterface.cpp
index 83fc8bef1..b28c75396 100644
--- a/sammy/src/salmon/interface/cpp/SammyGridAccessInterface.cpp
+++ b/sammy/src/salmon/interface/cpp/SammyGridAccessInterface.cpp
@@ -14,14 +14,14 @@ void SammyGridAccess_setParameters(void * SammyGridAccess_ptr,int * numcro,int *
((SammyGridAccess*)SammyGridAccess_ptr)->setParameters(*numcro,*ktzero);
}
-void SammyGridAccess_setExpGrid(void * SammyGridAccess_ptr,GridDataList * list)
+void SammyGridAccess_setToExpGrid(void * SammyGridAccess_ptr,GridDataList * list)
{
- ((SammyGridAccess*)SammyGridAccess_ptr)->setExpGrid(*list);
+ ((SammyGridAccess*)SammyGridAccess_ptr)->setToExpGrid(*list);
}
-void SammyGridAccess_setAuxGrid(void * SammyGridAccess_ptr,GridDataList * list)
+void SammyGridAccess_setToAuxGrid(void * SammyGridAccess_ptr,GridDataList * list)
{
- ((SammyGridAccess*)SammyGridAccess_ptr)->setAuxGrid(*list);
+ ((SammyGridAccess*)SammyGridAccess_ptr)->setToAuxGrid(*list);
}
double SammyGridAccess_getEnergy(void * SammyGridAccess_ptr,int * index,GridDataList * list)
diff --git a/sammy/src/salmon/interface/cpp/SammyGridAccessInterface.h b/sammy/src/salmon/interface/cpp/SammyGridAccessInterface.h
index 5d8568045..901d2cd9b 100644
--- a/sammy/src/salmon/interface/cpp/SammyGridAccessInterface.h
+++ b/sammy/src/salmon/interface/cpp/SammyGridAccessInterface.h
@@ -14,8 +14,8 @@ using namespace sammy;
extern "C" {
#endif
void SammyGridAccess_setParameters(void * SammyGridAccess_ptr,int * numcro,int * ktzero);
-void SammyGridAccess_setExpGrid(void * SammyGridAccess_ptr,GridDataList * list);
-void SammyGridAccess_setAuxGrid(void * SammyGridAccess_ptr,GridDataList * list);
+void SammyGridAccess_setToExpGrid(void * SammyGridAccess_ptr,GridDataList * list);
+void SammyGridAccess_setToAuxGrid(void * SammyGridAccess_ptr,GridDataList * list);
double SammyGridAccess_getEnergy(void * SammyGridAccess_ptr,int * index,GridDataList * list);
double SammyGridAccess_getOrigEnergy(void * SammyGridAccess_ptr,int * index,GridDataList * list);
int SammyGridAccess_getNumEnergies(void * SammyGridAccess_ptr,GridDataList * index);
diff --git a/sammy/src/salmon/interface/fortran/SammyGridAccess_I.f90 b/sammy/src/salmon/interface/fortran/SammyGridAccess_I.f90
index 2ac5e0704..891badec6 100644
--- a/sammy/src/salmon/interface/fortran/SammyGridAccess_I.f90
+++ b/sammy/src/salmon/interface/fortran/SammyGridAccess_I.f90
@@ -16,13 +16,13 @@ subroutine f_SammyGridAccess_setParameters(SammyGridAccess_ptr, numcro,ktzero )
integer(C_INT) :: numcro;
integer(C_INT) :: ktzero;
end subroutine
-subroutine f_SammyGridAccess_setExpGrid(SammyGridAccess_ptr, list ) BIND(C,name="SammyGridAccess_setExpGrid")
+subroutine f_SammyGridAccess_setToExpGrid(SammyGridAccess_ptr, list ) BIND(C,name="SammyGridAccess_setToExpGrid")
use,intrinsic :: ISO_C_BINDING
implicit none
type(C_PTR), value :: SammyGridAccess_ptr;
type(C_PTR), value :: list;
end subroutine
-subroutine f_SammyGridAccess_setAuxGrid(SammyGridAccess_ptr, list ) BIND(C,name="SammyGridAccess_setAuxGrid")
+subroutine f_SammyGridAccess_setToAuxGrid(SammyGridAccess_ptr, list ) BIND(C,name="SammyGridAccess_setToAuxGrid")
use,intrinsic :: ISO_C_BINDING
implicit none
type(C_PTR), value :: SammyGridAccess_ptr;
diff --git a/sammy/src/salmon/interface/fortran/SammyGridAccess_M.f90 b/sammy/src/salmon/interface/fortran/SammyGridAccess_M.f90
index c20ac0b29..ec9930e89 100644
--- a/sammy/src/salmon/interface/fortran/SammyGridAccess_M.f90
+++ b/sammy/src/salmon/interface/fortran/SammyGridAccess_M.f90
@@ -14,8 +14,8 @@ type SammyGridAccess
type(C_PTR) :: instance_ptr=C_NULL_PTR
contains
procedure, pass(this) :: setParameters => SammyGridAccess_setParameters
- procedure, pass(this) :: setExpGrid => SammyGridAccess_setExpGrid
- procedure, pass(this) :: setAuxGrid => SammyGridAccess_setAuxGrid
+ procedure, pass(this) :: setToExpGrid => SammyGridAccess_setToExpGrid
+ procedure, pass(this) :: setToAuxGrid => SammyGridAccess_setToAuxGrid
procedure, pass(this) :: getEnergy => SammyGridAccess_getEnergy
procedure, pass(this) :: getOrigEnergy => SammyGridAccess_getOrigEnergy
procedure, pass(this) :: getNumEnergies => SammyGridAccess_getNumEnergies
@@ -30,17 +30,17 @@ subroutine SammyGridAccess_setParameters(this, numcro, ktzero)
integer(C_INT)::ktzero
call f_SammyGridAccess_setParameters(this%instance_ptr, numcro,ktzero)
end subroutine
-subroutine SammyGridAccess_setExpGrid(this, list)
+subroutine SammyGridAccess_setToExpGrid(this, list)
implicit none
class(SammyGridAccess)::this
class(GridDataList)::list
- call f_SammyGridAccess_setExpGrid(this%instance_ptr, list%instance_ptr)
+ call f_SammyGridAccess_setToExpGrid(this%instance_ptr, list%instance_ptr)
end subroutine
-subroutine SammyGridAccess_setAuxGrid(this, list)
+subroutine SammyGridAccess_setToAuxGrid(this, list)
implicit none
class(SammyGridAccess)::this
class(GridDataList)::list
- call f_SammyGridAccess_setAuxGrid(this%instance_ptr, list%instance_ptr)
+ call f_SammyGridAccess_setToAuxGrid(this%instance_ptr, list%instance_ptr)
end subroutine
function SammyGridAccess_getEnergy(this, index, list) result(result2Return)
implicit none
diff --git a/sammy/src/salmon/tests/SammyGridAccessTest.cpp b/sammy/src/salmon/tests/SammyGridAccessTest.cpp
index 232e14cf9..974bb46d2 100644
--- a/sammy/src/salmon/tests/SammyGridAccessTest.cpp
+++ b/sammy/src/salmon/tests/SammyGridAccessTest.cpp
@@ -128,21 +128,21 @@ TEST(GridAcccesTest, twoGridsNoOffset){
sammy::SammyGridAccess access;
access.setParameters(numcro, ktzero);
- access.setExpGrid(list);
+ access.setToExpGrid(list);
testFirstGrid(access, list, ktzero);
list.setExpGridIndex(1);
- access.setExpGrid(list);
+ access.setToExpGrid(list);
testSecondGrid(access, list, ktzero);
list.setExpGridIndex(0);
list.setAuxGridIndex(1);
- access.setAuxGrid(list);
+ access.setToAuxGrid(list);
testSecondGrid(access, list, 0);
list.setExpGridIndex(1);
list.setAuxGridIndex(0);
- access.setAuxGrid(list);
+ access.setToAuxGrid(list);
testFirstGrid(access, list, 0);
}
}
@@ -162,21 +162,21 @@ TEST(GridAcccesTest, twoGridsOffset){
sammy::SammyGridAccess access;
access.setParameters(numcro, ktzero);
- access.setExpGrid(list);
+ access.setToExpGrid(list);
testFirstGridOff(access, list, ktzero);
list.setExpGridIndex(1);
- access.setExpGrid(list);
+ access.setToExpGrid(list);
testSecondGridOff(access, list, ktzero);
list.setExpGridIndex(0);
list.setAuxGridIndex(1);
- access.setAuxGrid(list);
+ access.setToAuxGrid(list);
testSecondGridOff(access, list, 0);
list.setExpGridIndex(1);
list.setAuxGridIndex(0);
- access.setAuxGrid(list);
+ access.setToAuxGrid(list);
testFirstGridOff(access, list, 0);
}
}
@@ -194,21 +194,21 @@ TEST(GridAcccesTest, oneGridsNoOffset){
sammy::SammyGridAccess access;
access.setParameters(numcro, ktzero);
- access.setExpGrid(list);
+ access.setToExpGrid(list);
testFirstGrid(access, list, ktzero);
list.setExpGridIndex(1);
- access.setExpGrid(list);
+ access.setToExpGrid(list);
testFirstGrid(access, list, ktzero);
list.setExpGridIndex(0);
list.setAuxGridIndex(1);
- access.setAuxGrid(list);
+ access.setToAuxGrid(list);
testFirstGrid(access, list, ktzero);
list.setExpGridIndex(1);
list.setAuxGridIndex(0);
- access.setAuxGrid(list);
+ access.setToAuxGrid(list);
testFirstGrid(access, list, ktzero);
}
}
@@ -227,21 +227,21 @@ TEST(GridAcccesTest, oneGridsOffset){
sammy::SammyGridAccess access;
access.setParameters(numcro, ktzero);
- access.setExpGrid(list);
+ access.setToExpGrid(list);
testFirstGridOff(access, list, ktzero);
list.setExpGridIndex(1);
- access.setExpGrid(list);
+ access.setToExpGrid(list);
testFirstGridOff(access, list, ktzero);
list.setExpGridIndex(0);
list.setAuxGridIndex(1);
- access.setAuxGrid(list);
+ access.setToAuxGrid(list);
testFirstGridOff(access, list, ktzero);
list.setExpGridIndex(1);
list.setAuxGridIndex(0);
- access.setAuxGrid(list);
+ access.setToAuxGrid(list);
testFirstGridOff(access, list, ktzero);
}
}
diff --git a/sammy/src/smc/msmc1.f b/sammy/src/smc/msmc1.f
index f6c6efc4a..04ea8814f 100755
--- a/sammy/src/smc/msmc1.f
+++ b/sammy/src/smc/msmc1.f
@@ -25,7 +25,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
C
C *** Initialize random-number-generators
CALL Rndin (1,21)
@@ -578,7 +578,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
C
DO I=1,I2
Y0(I)=(1.0D0-dEXP(-Total(I)*Th))*Captur(I)/Total(I)
diff --git a/sammy/src/ssm/mssm01.f90 b/sammy/src/ssm/mssm01.f90
index 16a915fd8..af093355a 100644
--- a/sammy/src/ssm/mssm01.f90
+++ b/sammy/src/ssm/mssm01.f90
@@ -260,7 +260,7 @@ module ssm_1_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Elastic = 0.0d0
N = Nn
diff --git a/sammy/src/ssm/mssm03.f90 b/sammy/src/ssm/mssm03.f90
index fef720373..5962a67bd 100644
--- a/sammy/src/ssm/mssm03.f90
+++ b/sammy/src/ssm/mssm03.f90
@@ -37,7 +37,7 @@ module ssm_3_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Itimes = 1
Imin = 1
@@ -168,7 +168,7 @@ module ssm_3_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Itimes = 1
Kountr = 0
@@ -340,7 +340,7 @@ module ssm_3_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Itimes = 1
Kountr = 0
@@ -513,7 +513,7 @@ module ssm_3_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Itimes = 1
Kountr = 0
@@ -690,7 +690,7 @@ module ssm_3_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Itimes = 1
Kountr = 0
diff --git a/sammy/src/ssm/mssm04.f90 b/sammy/src/ssm/mssm04.f90
index c71d3dae4..5c75301cc 100644
--- a/sammy/src/ssm/mssm04.f90
+++ b/sammy/src/ssm/mssm04.f90
@@ -42,7 +42,7 @@ module ssm_4_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Itimes = 1
Kountr = 0
@@ -234,7 +234,7 @@ module ssm_4_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Itimes = 1
Kountr = 0
@@ -428,7 +428,7 @@ module ssm_4_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Itimes = 1
Kountr = 0
@@ -625,7 +625,7 @@ module ssm_4_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Itimes = 1
Kountr = 0
diff --git a/sammy/src/ssm/mssm05.f90 b/sammy/src/ssm/mssm05.f90
index 4dc331886..3e7c68f38 100644
--- a/sammy/src/ssm/mssm05.f90
+++ b/sammy/src/ssm/mssm05.f90
@@ -56,7 +56,7 @@ module ssm_5_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
!
CALL Zero2_1 (A, Sumw, Yyy1xx, Nx)
@@ -360,7 +360,7 @@ module ssm_5_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
!
CALL Zero2_1 (A, Sumw, Yyy1xx, Nx)
diff --git a/sammy/src/ssm/mssm06.f90 b/sammy/src/ssm/mssm06.f90
index f3a1d2542..149a48c95 100644
--- a/sammy/src/ssm/mssm06.f90
+++ b/sammy/src/ssm/mssm06.f90
@@ -58,7 +58,7 @@ module ssm_6_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
!
! *** Interpolate Sqfb to give Qfb at Total(E) (if doing edge-effects
@@ -354,7 +354,7 @@ module ssm_6_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
!
! *** Interpolate Sqfb to give Qfb at Total(E) (if doing edge-effects
diff --git a/sammy/src/ssm/mssm07.f90 b/sammy/src/ssm/mssm07.f90
index fddbc4bc2..34f1c106c 100644
--- a/sammy/src/ssm/mssm07.f90
+++ b/sammy/src/ssm/mssm07.f90
@@ -58,7 +58,7 @@ module ssm_7_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
!
CALL Zero2_2 (A, Sumw, Yyy1xx, Yyy2xx, Yyy2xq, Y2aaaa, Y2aaaq, Nx)
@@ -401,7 +401,7 @@ module ssm_7_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
!
CALL Zero2_2 (A, Sumw, Yyy1xx, Yyy2xx, Yyy2xq, Y2aaaa, Y2aaaq, Nx)
diff --git a/sammy/src/ssm/mssm08.f90 b/sammy/src/ssm/mssm08.f90
index 7943198c2..46eaf29c4 100644
--- a/sammy/src/ssm/mssm08.f90
+++ b/sammy/src/ssm/mssm08.f90
@@ -60,7 +60,7 @@ module ssm_8_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
!
! *** Interpolate Sqfb to give Qfb at Total(E) (if doing edge-effects
@@ -384,7 +384,7 @@ module ssm_8_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
!
! *** Interpolate Sqfb to give Qfb at Total(E) (if doing edge-effects
diff --git a/sammy/src/ssm/mssm09.f90 b/sammy/src/ssm/mssm09.f90
index 34395064c..a59b5b5c6 100644
--- a/sammy/src/ssm/mssm09.f90
+++ b/sammy/src/ssm/mssm09.f90
@@ -22,7 +22,7 @@ module ssm_9_m
!
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
E = grid%getEnergy(Iie, expData)
A = (Rmass-One) / (Rmass+One)
@@ -59,7 +59,7 @@ module ssm_9_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
IF (Ientrp.NE.0) THEN
Ii = Ientrp
@@ -144,7 +144,7 @@ module ssm_9_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Not_Quad = 0
IF (Ientrp.NE.0) THEN
@@ -328,7 +328,7 @@ module ssm_9_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
J2 = 0
Jj = J1
@@ -420,7 +420,7 @@ module ssm_9_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
WRITE (6,10100) Kadd, Maxx, Kwhich
10100 FORMAT (' Trouble in mulsca: too many points needed, Kadd,Maxx=', 3i5)
diff --git a/sammy/src/ssm/mssm18.f90 b/sammy/src/ssm/mssm18.f90
index cab406219..06b06e4ae 100644
--- a/sammy/src/ssm/mssm18.f90
+++ b/sammy/src/ssm/mssm18.f90
@@ -189,7 +189,7 @@ module ssm_18_m
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
!
Y2dddd = Zero
Y2dddq = Zero
@@ -307,10 +307,10 @@ module ssm_18_m
DATA Thous /1000.0d0/
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
call auxGrid%initialize()
call auxGrid%setParameters(numcro, ktzero)
- call auxGrid%setAuxGrid(expData)
+ call auxGrid%setToAuxGrid(expData)
!
Jj = 1
Em = grid%getEnergy(jj, expData)
diff --git a/sammy/src/the/mthe1.f b/sammy/src/the/mthe1.f
index 5ab822315..4fc457eba 100644
--- a/sammy/src/the/mthe1.f
+++ b/sammy/src/the/mthe1.f
@@ -53,7 +53,7 @@ C
call gridAccess%initialize()
call gridAccess%setParameters(numcro, ktzero)
- call gridAccess%setExpGrid(expData)
+ call gridAccess%setToExpGrid(expData)
C
IF (Kscut.EQ.-1) THEN
diff --git a/sammy/src/udr/mudr1.f b/sammy/src/udr/mudr1.f
index b16a1359d..55cb00435 100644
--- a/sammy/src/udr/mudr1.f
+++ b/sammy/src/udr/mudr1.f
@@ -56,7 +56,7 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
C
cxcx call timer_debug('0',0)
C *** initialize limits
diff --git a/sammy/src/udr/mudr4.f b/sammy/src/udr/mudr4.f
index 81b811a8e..ed971a9f5 100644
--- a/sammy/src/udr/mudr4.f
+++ b/sammy/src/udr/mudr4.f
@@ -27,7 +27,7 @@ C
T0 = Sm2*Dist/Dsqrt(Em)
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
C *** First, find max & min t needed for broadening
Tmin = T0
Tmax = T0
diff --git a/sammy/src/xct/mxct0.f b/sammy/src/xct/mxct0.f
index 51f3d4812..a15d02ec0 100644
--- a/sammy/src/xct/mxct0.f
+++ b/sammy/src/xct/mxct0.f
@@ -29,10 +29,10 @@ C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
call auxGrid%initialize()
call auxGrid%setParameters(numcro, ktzero)
- call auxGrid%setAuxGrid(expData)
+ call auxGrid%setToAuxGrid(expData)
numElAux = auxGrid%getNumEnergies(expData)
CALL Initil
@@ -561,7 +561,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
numEl = grid%getNumEnergies(expData)
X = 0.010
N = numEl + 1
diff --git a/sammy/src/xct/mxct02.f b/sammy/src/xct/mxct02.f
index d0bbd30b5..6fbaf7ca0 100644
--- a/sammy/src/xct/mxct02.f
+++ b/sammy/src/xct/mxct02.f
@@ -57,7 +57,7 @@ C
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setAuxGrid(expData)
+ call grid%setToAuxGrid(expData)
numEl = grid%getNumEnergies(expData)
Ywhich = Ydoppr.OR.Yresol.OR.Yangle.OR.Yssmsc.OR.Yaverg
diff --git a/sammy/src/xct/mxct27.f90 b/sammy/src/xct/mxct27.f90
index 520fd71f3..8bf899b44 100644
--- a/sammy/src/xct/mxct27.f90
+++ b/sammy/src/xct/mxct27.f90
@@ -46,7 +46,7 @@ module mxct27_m
IF (Montec.EQ.1) THEN
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
! *** Here to write files for use in Monte Carlo simulations
Iunit = 51
IF (Filein.EQ.'SAM51.DAT ') Iunit = 54
diff --git a/sammy/src/xxx/mxxx4.f b/sammy/src/xxx/mxxx4.f
index ef16c5ab1..150c029db 100644
--- a/sammy/src/xxx/mxxx4.f
+++ b/sammy/src/xxx/mxxx4.f
@@ -54,7 +54,7 @@ C *** Pi90 = 28.647, Pi180=57.296
C
call grid%initialize()
call grid%setParameters(numcro, ktzero)
- call grid%setExpGrid(expData)
+ call grid%setToExpGrid(expData)
e1 = grid%getEnergy(1, expData)
numEl = grid%getNumEnergies(expData)
e2 = grid%getEnergy(numEl, expData)
--
GitLab