Merge branch 'hyschive:main' into wiki_update_using_gamer

ChunYen-Chen · Sep 23, 2024 · f0c2e67 · f0c2e67
2 parents b54101b + 5a16ca4
commit f0c2e67
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/example/test_problem/Hydro/CDM_LSS/download_ic.sh b/example/test_problem/Hydro/CDM_LSS/download_ic.sh
@@ -1 +1 @@
-curl -JO http://use.yt/upload/c2b0f76b
+curl -LJO https://use.yt/upload/c2b0f76b
diff --git a/example/test_problem/Hydro/ClusterMerger/download_ic.sh b/example/test_problem/Hydro/ClusterMerger/download_ic.sh
@@ -1,4 +1,4 @@
 filename=gamer_ic_merging_cluster.tgz
-curl http://use.yt/upload/cceea6c4 -o $filename
+curl -L https://use.yt/upload/cceea6c4 -o $filename
 tar -zxvf $filename
 rm $filename
diff --git a/src/Model_Hydro/CPU_Hydro/CPU_Shared_DataReconstruction.cpp b/src/Model_Hydro/CPU_Hydro/CPU_Shared_DataReconstruction.cpp
@@ -637,18 +637,20 @@ void Hydro_DataReconstruction( const real g_ConVar   [][ CUBE(FLU_NXT) ],
 //          --> When LR_EINT is on, use the reconstructed internal energy instead of pressure in Hydro_Pri2Con()
 //              to skip expensive EoS conversion
 #        ifdef LR_EINT
-         real* const EintPtr = fcPri + NCOMP_TOTAL_PLUS_MAG;
+         real* const EintPtr_faceL = fcPri[faceL] + NCOMP_TOTAL_PLUS_MAG;
+         real* const EintPtr_faceR = fcPri[faceR] + NCOMP_TOTAL_PLUS_MAG;
 #        else
-         real* const EintPtr = NULL;
+         real* const EintPtr_faceL = NULL;
+         real* const EintPtr_faceR = NULL;
 #        endif
 
          Hydro_Pri2Con( fcPri[faceL], fcCon[faceL], FracPassive, NFrac, FracIdx, EoS->DensPres2Eint_FuncPtr,
                         EoS->Temp2HTilde_FuncPtr, EoS->HTilde2Temp_FuncPtr,
-                        EoS->AuxArrayDevPtr_Flt, EoS->AuxArrayDevPtr_Int, EoS->Table, EintPtr );
+                        EoS->AuxArrayDevPtr_Flt, EoS->AuxArrayDevPtr_Int, EoS->Table, EintPtr_faceL );
 
          Hydro_Pri2Con( fcPri[faceR], fcCon[faceR], FracPassive, NFrac, FracIdx, EoS->DensPres2Eint_FuncPtr,
                         EoS->Temp2HTilde_FuncPtr, EoS->HTilde2Temp_FuncPtr,
-                        EoS->AuxArrayDevPtr_Flt, EoS->AuxArrayDevPtr_Int, EoS->Table, EintPtr );
+                        EoS->AuxArrayDevPtr_Flt, EoS->AuxArrayDevPtr_Int, EoS->Table, EintPtr_faceR );
 
       } // for (int d=0; d<3; d++)
 
@@ -1342,18 +1344,20 @@ void Hydro_DataReconstruction( const real g_ConVar   [][ CUBE(FLU_NXT) ],
 //          --> When LR_EINT is on, use the reconstructed internal energy instead of pressure in Hydro_Pri2Con()
 //              to skip expensive EoS conversion
 #        ifdef LR_EINT
-         real* const EintPtr = fcPri + NCOMP_TOTAL_PLUS_MAG;
+         real* const EintPtr_faceL = fcPri[faceL] + NCOMP_TOTAL_PLUS_MAG;
+         real* const EintPtr_faceR = fcPri[faceR] + NCOMP_TOTAL_PLUS_MAG;
 #        else
-         real* const EintPtr = NULL;
+         real* const EintPtr_faceL = NULL;
+         real* const EintPtr_faceR = NULL;
 #        endif
 
          Hydro_Pri2Con( fcPri[faceL], fcCon[faceL], FracPassive, NFrac, FracIdx, EoS->DensPres2Eint_FuncPtr,
                         EoS->Temp2HTilde_FuncPtr, EoS->HTilde2Temp_FuncPtr,
-                        EoS->AuxArrayDevPtr_Flt, EoS->AuxArrayDevPtr_Int, EoS->Table, EintPtr );
+                        EoS->AuxArrayDevPtr_Flt, EoS->AuxArrayDevPtr_Int, EoS->Table, EintPtr_faceL );
 
          Hydro_Pri2Con( fcPri[faceR], fcCon[faceR], FracPassive, NFrac, FracIdx, EoS->DensPres2Eint_FuncPtr,
                         EoS->Temp2HTilde_FuncPtr, EoS->HTilde2Temp_FuncPtr,
-                        EoS->AuxArrayDevPtr_Flt, EoS->AuxArrayDevPtr_Int, EoS->Table, EintPtr );
+                        EoS->AuxArrayDevPtr_Flt, EoS->AuxArrayDevPtr_Int, EoS->Table, EintPtr_faceR );
 
       } // for (int d=0; d<3; d++)