diff --git a/src/Physics/Initial_Conditions.F90 b/src/Physics/Initial_Conditions.F90 index e641723c..92e0638b 100755 --- a/src/Physics/Initial_Conditions.F90 +++ b/src/Physics/Initial_Conditions.F90 @@ -636,8 +636,7 @@ subroutine magnetic_file_init() end subroutine magnetic_file_init - !NICK - subroutine add_to_field(field_index, field_file) + Subroutine Add_To_Field(field_index, field_file) ! initialize magnetic variables from generic input files Implicit None Integer, Intent(In) :: field_index @@ -645,25 +644,25 @@ subroutine add_to_field(field_index, field_file) Integer :: fcount(3,2) Type(SphericalBuffer) :: tempfield, tempfield2 fcount(:,:) = 1 - call tempfield%init(field_count = fcount, config = 'p1b') - call tempfield%construct('p1b') - call tempfield2%init(field_count = fcount, config = 'p1b') - call tempfield2%construct('p1b') + Call tempfield%init(field_count = fcount, config = 'p1b') + Call tempfield%construct('p1b') + Call tempfield2%init(field_count = fcount, config = 'p1b') + Call tempfield2%construct('p1b') - call get_rhs(field_index,tempfield2%p1b(:,:,:,1)) + Call get_rhs(field_index,tempfield2%p1b(:,:,:,1)) - if (trim(field_file) .ne. '__nothing__') then - call read_input(field_file, 1, tempfield) + If (trim(field_file) .ne. '__nothing__') Then + Call read_input(field_file, 1, tempfield) tempfield%p1b = tempfield%p1b+tempfield2%p1b - call set_rhs(field_index, tempfield%p1b(:,:,:,1)) - end if + Call set_rhs(field_index, tempfield%p1b(:,:,:,1)) + End If - call tempfield%deconstruct('p1b') - call tempfield2%deconstruct('p1b') + Call tempfield%deconstruct('p1b') + Call tempfield2%deconstruct('p1b') - end subroutine add_to_field + End Subroutine add_to_field !////////////////////////////////////////////////////////////////////////////////// ! Diffusion Init (for linear solve development) diff --git a/src/Physics/PDE_Coefficients.F90 b/src/Physics/PDE_Coefficients.F90 index 8523574b..03bab511 100644 --- a/src/Physics/PDE_Coefficients.F90 +++ b/src/Physics/PDE_Coefficients.F90 @@ -1287,12 +1287,10 @@ Subroutine Read_Custom_Reference_File(filename) Read(15) input_constants(1:10) cset(11) = 1 ! treat this as if c_11 = 1 was specified in the custom reference file input_constants(11) = 1.0d0 - If (my_rank .eq. 0) Call stdout%print('got here') Else Read(15) cset(1:n_ra_constants) Read(15) fset(1:n_ra_functions) Read(15) input_constants(1:n_ra_constants) - Call stdout%print('actualy got here') Endif ! Cset(i) is 1 if a constant(i) was set; it is 0 otherwise.