diff --git a/sammy/src/par/mpar03.f90 b/sammy/src/par/mpar03.f90 index 164dfb5d671e78fa70bd638261e4547ab2109228..983d1d4ed82b6f4293116e4d930b2fb5d6ad64f8 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 2f201cad57771e0d7b71b273ada4d03e608aa517..7809263d8c1c16dffae10b5b4cc495936187a3af 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()