max/poet
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/poet.git synced 2025-12-16 04:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge issues

Browse Source
This commit is contained in:
straile 2024-11-04 15:56:09 +01:00
parent 8551e07450
commit c4d6197e9b
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Chemistry/WorkerFunctions.cpp
View File

@ -170,10 +170,7 @@ void poet::ChemistryModule::WorkerDoWork(MPI_Status &probe_status,
}
}
<<<<<<< HEAD
=======
// std::cout << this->comm_rank << ":" << counter++ << std::endl;
>>>>>>> segfault_find_reason
if (dht_enabled || interp_enabled) {
dht->prepareKeys(s_curr_wp.input, dt);
}
@ -190,10 +187,6 @@ void poet::ChemistryModule::WorkerDoWork(MPI_Status &probe_status,
interp->tryInterpolation(s_curr_wp);
}
<<<<<<< HEAD
=======
>>>>>>> segfault_find_reason
phreeqc_time_start = MPI_Wtime();
WorkerRunWorkPackage(s_curr_wp, current_sim_time, dt);

9
src/poet.hpp.in
View File

@ -71,21 +71,12 @@ struct RuntimeParameters {
/*AI surriogate configuration*/
bool use_ai_surrogate = false; // Can be set with command line flag ---ai-surrogate
<<<<<<< HEAD
bool disable_training = false; // Can be set in the R input script
bool use_clustering = false; // Can be set in the R input script
bool use_Keras_predictions = false; // Can be set in the R input script
bool train_only_invalid = false; // Can be set in the R input script
int batch_size = 2560; // default value determined in test on the UP Turing cluster
int training_epochs = 20;; // Can be set in the R input script
=======
bool disable_training; // Can be set in the R input script
bool use_k_means_clustering; // Can be set in the R input script
bool use_Keras_predictions; // Can be set in the R input script
bool train_only_invalid; // Can be set in the R input script
int batch_size; // Can be set in the R input script
int training_epochs; // Can be set in the R input script
>>>>>>> segfault_find_reason
int training_data_size; // Can be set in the R input script
std::string save_model_path = ""; // Can be set in the R input script
std::string cuda_src_dir = CUDA_SRC_DIR; // From CMake