diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-09-18 08:59:44 -0400 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-09-18 08:59:44 -0400 |
| commit | 7f98e9c06fadde04fc195044af1ee9b98810c502 (patch) | |
| tree | 59e7d3c494e2dcab29398d78977e6f0df4e925b7 /Donjon/src | |
| parent | d6bb5a906cbec44aec2a59c56ebeadc52d4871a5 (diff) | |
| parent | 94bff5afcc673da0cd23cfc07f8cdda808d20d9a (diff) | |
Merge branch '2-reduce-multicompo-size-for-two-donjon-non-regression-tests' into 'main'
Resolve "Reduce multicompo size for two Donjon non-regression tests"
See merge request dragon/5.1!7
Diffstat (limited to 'Donjon/src')
| -rw-r--r-- | Donjon/src/NAPPPR.f | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Donjon/src/NAPPPR.f b/Donjon/src/NAPPPR.f index d1f891c..af5a79b 100644 --- a/Donjon/src/NAPPPR.f +++ b/Donjon/src/NAPPPR.f @@ -58,6 +58,7 @@ 2 FLUGP(NGPT,NGPT,NGPT)
REAL E(25)
LOGICAL LSPX,LSPY,LSPZ,LCH,LPOW,LNOINT,LDEBUG
+ DOUBLE PRECISION XDRCST,EVJ
*----
* ALLOCATABLE ARRAYS
*----
@@ -625,6 +626,7 @@ C end IG CALL LCMSIX(IPMAC,'GFF-GEOM',2)
CALL LCMSIX(IPMAC,'GFF',2)
+ EVJ=XDRCST('eV','J')
DO IG=1,NG
DO IASS=1,NASS
@@ -634,15 +636,16 @@ C end IG ! > 1 for heterogeneous assembly
! Note that all values of HFM are identical
! for all the mix in a specific assembly
+! Conversion from eV to J
IMIX=(IASS-1+(K-1)*NASS)*NAMIX+1
DO J=1,NPIN
DO I=1,NPIN
IPIN=I+(J-1)*NPIN
- HF(I,J,K,IG,IASS)=HFM(IMIX,BMIXP(IPIN),IG)
+ HF(I,J,K,IG,IASS)=HFM(IMIX,BMIXP(IPIN),IG)*REAL(EVJ)
FTINF(I,J,K,IG,IASS)=FTINFM(IMIX,BMIXP(IPIN),IG)
FDINF(I,J,K,IG,IASS)=FDINFM(IMIX,BMIXP(IPIN),IG)
VOL(I,J,K,IASS)=(MXP(I+1)-MXP(I))*(MYP(J+1)-MYP(J))
- 3 *(MZM(K1+K)-MZM(K1+K-1))
+ 1 *(MZM(K1+K)-MZM(K1+K-1))
ENDDO
ENDDO
ENDDO
|