htgop

commit 491de2e1fd2c269dd7987803253db619588421e5
parent 22df719f66edfa9baba1fb2d8906b4b8d01c79bb
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed,  1 Aug 2018 17:24:10 +0200

Upd the ecrad_opt_prop.txt file

On loading, check that the radiative properties are positives

Diffstat:
M
cmake/CMakeLists.txt
 | 
14
+++++++++-----
M
etc.tgz
 | 
4
++--
M
src/htgop_parse_layers_spectral_intervals_data.h
 | 
2
--

3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -92,12 +92,16 @@ if(NOT NO_TEST)
     add_test(${_name} ${_name})
   endfunction()
 
-  get_filename_component(_etc_src "${PROJECT_SOURCE_DIR}/../etc.tgz" ABSOLUTE)
   set(_etc_dst ${CMAKE_CURRENT_BINARY_DIR}/etc/)
-  if(NOT EXISTS ${_etc_dst})
-    message(STATUS "Extracting ${_etc_src}")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${_etc_src})
-  endif()
+  get_filename_component(_etc_src "${PROJECT_SOURCE_DIR}/../etc.tgz" ABSOLUTE)
+  add_custom_command(
+    OUTPUT etc.stamp
+    COMMAND ${CMAKE_COMMAND} -E tar xzf "${_etc_src}"
+    COMMAND ${CMAKE_COMMAND} -E touch etc.stamp
+    DEPENDS "${_etc_src}"
+    COMMENT "Extract ${_etc_src}"
+    VERBATIM)
+  add_custom_target(extract-etc ALL DEPENDS etc.stamp)
 
   new_test(test_htgop)
   build_test(test_htgop_fetch_radiative_properties)
diff --git a/etc.tgz b/etc.tgz
@@ -1 +1 @@
-#$# git-wad 7f30f1e0f6e38b0a6d0655bc8c289173c3e8625cc459fdaaf76b5f2afe34f407 12098732
-\ No newline at end of file
+#$# git-wad 68f33206ad502e4ae5a42c6ef6c1dd08d07680cbf8bf2415c2fe2aad6687cef9 12091902
+\ No newline at end of file
diff --git a/src/htgop_parse_layers_spectral_intervals_data.h b/src/htgop_parse_layers_spectral_intervals_data.h
@@ -85,13 +85,11 @@ CONCAT(parse_layers_spectral_intervals_,  DATA)
             (&layers[ilay].XDOMAIN(specints)) + ispecint;
           XDATA(tab) = darray_dbllst_data_get(&layspecint->XDATA(tab)) + iquad;
           CALL(cstr_to_double(read_line(rdr), &darray_double_data_get(XDATA(tab))[itab]));
-#if 0
           if(darray_double_data_get(XDATA(tab))[itab] < 0) {
             log_err(htgop, "The radiative properties cannot be negative.\n");
             res = RES_BAD_ARG;
             goto error;
           }
-#endif
         }
       }
     }