test maanager

siwaa_recipe/container/Dockerfile

@@ -11,7 +11,7 @@ ENV VLE_HOME=/data
 WORKDIR /data
 
 RUN git clone https://github.com/rtrepos/vle.git \
-    && cd vle \
+    &&     cd vle \
     && git checkout origin/manager -b manager \
     && mkdir build \
     && cd build \
@@ -52,7 +52,7 @@ RUN cd RECORD/pkgs \
     && vle -P vle.discrete-time.generic clean rclean configure build
 
 RUN git clone https://forgemia.inra.fr/record/azodyn.git \
-    && cd azodyn \
+    &&    cd azodyn \
     && git checkout origin/siwaa -b siwaa \
     && vle -P AZODYN configure build
 

siwaa_recipe/file_input.csv

@@ -3,52 +3,4 @@ cPlant.coef_tot_a;condClimate.meteo_file
 1.5;Breteniere_1991_2018_test.csv
 1.0;Breteniere_1991_2018_test.csv
 1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-1.25;Breteniere_1991_2018_test.csv
-1.5;Breteniere_1991_2018_test.csv
-1.0;Breteniere_1991_2018_test.csv
-
 

siwaa_recipe/razodyn.R

@@ -3,21 +3,24 @@
 ##
 
 print(Sys.info())
-Sys.setenv(VLE_HOME = "/data")
+#Sys.setenv(VLE_HOME = "/data")
 
 args=(commandArgs(TRUE))
 file_define = "file_define.csv";
 file_propagate = "file_propagate.csv";
 file_replicate = "file_replicate.csv";
-file_input = args[1];
+file_input = "file_input.csv";
+#file_input = args[1];
 ## mycond1.myport1;mycond2.myport2;;mycond3.myport3    
 # 2.5;coucou;4
 # 2.6;bye;1
 # 2.4;pffff;6
-file_output = args[2];
+file_output = "file_outputs.csv";
+#file_output = args[2];
 ##id of output, path, integration, aggregation_replicate, aggregation_input, replicate_quantile, time1, obs1, time2, obs2, ... 
 #myid1;myview/atomic.Port1;"last";"quantile";"all";0.2;123;0.5;138;0.8  
-nbslots = as.integer(args[3])
+nbslots = 3
+#nbslots = as.integer(args[3])
 
 
 
@@ -28,22 +31,25 @@ print(paste("getwd:",getwd()))
 print(paste("dir(getwd()):",dir(getwd())))
 
 
-f = rvlePlan.open("AzodynPea.vpz", "AZODYN")
+f = rvle.open("AzodynPea.vpz", "AZODYN")
 
-rvlePlan.config(f, parallel_nb_slots=nbslots,  parallel_rm_files=TRUE,
-              parallel_type="cvle", parallel_spawn=F, generate_hostfile=TRUE,
+rvle.set_log_level(f, 7);
+
+rvle.plan_config(f, parallel_nb_slots=nbslots, parallel_rm_files=TRUE,
+              parallel_type="threads", parallel_spawn=F, 
+              generate_hostfile=TRUE,
               working_dir=getwd());
 
-inputs = rvleExp.parseSim(file_sim=file_input, rvle_handle=f, skip=0)
+inputs = rvleExp.parseSim(file_sim=file_input, vleObj=f, skip=0)
 
-rvlePlan.propagate(f, cond="condClimate", port="PkgName", value="")
+rvle.plan_propagate(f, cond="condClimate", port="PkgName", val="")
 
 outs = read.table(file_output, sep=";",header=T, stringsAsFactors=F)
 for (i in 1:nrow(outs)) {
-	rvlePlan.output(rvleHandle=f, id=outs$id[i], path=outs$path[i], 
+	rvle.plan_output(vleObj=f, id=outs$id[i], path=outs$path[i], 
 				   integration=outs$integration[i])
 }
-res = rvlePlan.run(f)
+res = rvle.plan_run(f)
 for (i in 1:nrow(outs)) {
 	write.table(res[[outs$id[i]]], file=paste(sep="", 'razodyn_results_',outs$id[i],'.txt'),
 		    row.names=F, col.names=F, sep=";")