diff --git a/CMakeLists.txt b/CMakeLists.txt index 17e471e..e31bf08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION "3.14") -project(EQUILIBRATE LANGUAGES Fortran C VERSION "0.1.2") +project(EQUILIBRATE LANGUAGES Fortran C VERSION "0.1.3") set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/modules") include(cmake/CPM.cmake) diff --git a/src/equilibrate.f90 b/src/equilibrate.f90 index 5238e78..fe9bc54 100644 --- a/src/equilibrate.f90 +++ b/src/equilibrate.f90 @@ -317,7 +317,7 @@ function solve_metallicity(self, P, T, metallicity, CtoO, err) result(converged) ! Compute atoms based on the input metallicity. molfracs_atoms = self%molfracs_atoms_sun do i = 1,size(molfracs_atoms) - if (self%atoms_names(i) /= 'H' .or. self%atoms_names(i) /= 'He') then + if (self%atoms_names(i) /= 'H' .and. self%atoms_names(i) /= 'He') then molfracs_atoms(i) = self%molfracs_atoms_sun(i)*metallicity endif enddo