diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-11-13 13:13:41 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-11-13 13:13:41 -0500 |
| commit | a870f2d0d950b0b1d4aedef6f0363b5f8bf01b16 (patch) | |
| tree | aad98db8f19dbd1d493c069a7d03a5faafb2229c | |
| parent | 372969d71ef6f2bdd4b468b0e997852b847a5aa2 (diff) | |
| parent | 733dff759433a8cace9805d6127b4bfa3f71e221 (diff) | |
Merge branch '5-corrections-and-improvements-to-the-baff-refl-reflector-model-in-donjon' into 'main'
Correct a bug in SPH decorrection
See merge request dragon/5.1!23
| -rw-r--r-- | Dragon/src/APXCA2.f | 7 | ||||
| -rw-r--r-- | Dragon/src/MPOCA2.f | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Dragon/src/APXCA2.f b/Dragon/src/APXCA2.f index e541cc8..97aa69e 100644 --- a/Dragon/src/APXCA2.f +++ b/Dragon/src/APXCA2.f @@ -129,7 +129,7 @@ CALL LCMGET(IPEDIT,'VOLUME',VOLMIX) JPEDIT=LCMGID(IPEDIT,'GROUP') LSPH=.FALSE. - ALLOCATE(SPH(NMIL,NG)) + ALLOCATE(SPH(NMIL+NALBP,NG)) DO 80 IGR=1,NG KPEDIT=LCMGIL(JPEDIT,IGR) CALL LCMLEN(KPEDIT,'NSPH',ILONG,ITYLCM) @@ -139,8 +139,11 @@ DO 70 IMIL=1,NMIL SPH(IMIL,IGR)=1.0/WORK1(IMIL) 70 CONTINUE + DO 75 IALB=1,NALBP + SPH(NMIL+IALB,IGR)=1.0 + 75 CONTINUE ELSE - SPH(:NMIL,IGR)=1.0 + SPH(:NMIL+NALBP,IGR)=1.0 ENDIF 80 CONTINUE CALL LCMSIX(IPEDIT,' ',2) diff --git a/Dragon/src/MPOCA2.f b/Dragon/src/MPOCA2.f index 3fd0927..70a24a8 100644 --- a/Dragon/src/MPOCA2.f +++ b/Dragon/src/MPOCA2.f @@ -246,7 +246,7 @@ CALL LCMSIX(IPEDIT,'MACROLIB',1) JPEDIT=LCMGID(IPEDIT,'GROUP') LSPH=.FALSE. - ALLOCATE(SPH(NMIL,NG)) + ALLOCATE(SPH(NMIL+NALBP,NG)) DO 120 IGR=1,NG KPEDIT=LCMGIL(JPEDIT,IGR) CALL LCMLEN(KPEDIT,'NSPH',ILONG,ITYLCM) @@ -256,10 +256,11 @@ DO 100 IMIL=1,NMIL SPH(IMIL,IGR)=1.0/WORK1(IMIL) 100 CONTINUE + DO 110 IALB=1,NALBP + SPH(NMIL+IALB,IGR)=1.0 + 110 CONTINUE ELSE - DO 110 IMIL=1,NMIL - SPH(IMIL,IGR)=1.0 - 110 CONTINUE + SPH(:NMIL+NALBP,IGR)=1.0 ENDIF 120 CONTINUE CALL LCMSIX(IPEDIT,' ',2) |