update clima

Author: Nicholaswogan

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION "3.14")
 cmake_policy(SET CMP0148 OLD)
 
-project(Photochem LANGUAGES Fortran C VERSION "0.7.0")
+project(Photochem LANGUAGES Fortran C VERSION "0.8.0")
 set(PHOTOCHEM_CLIMA_DATA_VERSION "0.3.1")
 
 include(FortranCInterface)

photochem/utils/climate.py

@@ -144,14 +144,8 @@ def settings_dict_for_climate(planet_mass, planet_radius, surface_albedo,
             'photon-scale-factor': photon_scale_factor
         },
         'optical-properties': {
-            'ir': {
-                'k-method': 'RandomOverlapResortRebin',
-                'opacities': opacities
-            },
-            'solar': {
-                'k-method': 'RandomOverlapResortRebin',
-                'opacities': opacities
-            }
+            'k-method': 'RandomOverlapResortRebin',
+            'opacities': opacities
         }
     }
 
@@ -192,7 +186,6 @@ def settings_file_for_climate(filename, planet_mass, planet_radius, surface_albe
         opacities
     )
 
-    settings['optical-properties']['ir']['opacities'] = flowmap(settings['optical-properties']['ir']['opacities'])
-    settings['optical-properties']['solar']['opacities'] = flowmap(settings['optical-properties']['solar']['opacities'])
+    settings['optical-properties']['opacities'] = flowmap(settings['optical-properties']['opacities'])
     with open(filename, 'w') as f:
         yaml.dump(settings,f,Dumper=MyDumper,sort_keys=False,width=70)

src/dependencies/CMakeLists.txt

@@ -49,15 +49,15 @@ CPMAddPackage(
 
 CPMAddPackage(
   NAME clima 
-  VERSION 0.5.15
+  VERSION 0.6.0
   OPTIONS 
     "BUILD_EXECUTABLE OFF"
     "BUILD_WITH_OPENMP ${BUILD_WITH_OPENMP}"
     "SKBUILD ${SKBUILD}"
     "BUILD_PYTHON_CLIMA ${BUILD_PYTHON_PHOTOCHEM}"
     "PYTHON_CLIMA_DESTINATION photochem"
   GITHUB_REPOSITORY "Nicholaswogan/clima"
-  GIT_TAG "v0.5.15"
+  GIT_TAG "v0.6.0"
   EXCLUDE_FROM_ALL OFF
 )