From 28b84e9fd363a76411c9dfa5d03d49c804bd9455 Mon Sep 17 00:00:00 2001
From: Brown <2mx@ornl.gov>
Date: Wed, 11 Aug 2021 16:43:18 -0400
Subject: [PATCH] allow rrr api calc to change urr-calc variable
---
sammy/src/par/mpar03.f90 | 10 ++--------
sammy/src/sam/sammy_api_m.f90 | 2 ++
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/sammy/src/par/mpar03.f90 b/sammy/src/par/mpar03.f90
index 164dfb5d6..983d1d4ed 100644
--- a/sammy/src/par/mpar03.f90
+++ b/sammy/src/par/mpar03.f90
@@ -52,13 +52,10 @@ module par3_m
do
read(iu32,'(a)', end=20) line
- if (trim(line).eq."") goto 30
+ if (trim(line).eq."") goto 20
call reader%addLine(line)
end do
20 continue
- WRITE (21,300)
-300 FORMAT (' BLANK LINE MISSING IN .Par FILE')
- 30 continue
ierr = reader%readParameterCard1(resParData)
@@ -541,14 +538,11 @@ module par3_m
read(Kfile,'(a)', end=20) line
if (trim(line).eq."") then
backspace(Kfile)
- goto 30
+ goto 20
end if
call reader%addLine(line)
end do
20 continue
- WRITE (21,300)
-300 FORMAT (' BLANK LINE MISSING IN .Par FILE')
- 30 continue
ier = reader%readParameterCard10(resParData)
if( ier.ne.0) then
diff --git a/sammy/src/sam/sammy_api_m.f90 b/sammy/src/sam/sammy_api_m.f90
index 2f201cad5..7809263d8 100755
--- a/sammy/src/sam/sammy_api_m.f90
+++ b/sammy/src/sam/sammy_api_m.f90
@@ -65,6 +65,8 @@ contains
if( sizeData.lt.0 ) then
urr_calc = .true. ! when we're calling this through fitAPI
sizeData = sizeData * (-1)
+ else
+ urr_calc = .false.
end if
call resParData%initialize()
--
GitLab