From 55981b06ce07e970d8dca3d20754a2fa8d62537b Mon Sep 17 00:00:00 2001
From: James E McClure <mcclurej@vt.edu>
Date: Fri, 22 May 2020 13:11:50 -0400
Subject: [PATCH] fix force adaptation

---
 models/ColorModel.cpp           | 28 ++++++++++++++++------------
 sample_scripts/configure_summit |  3 +++
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp
index 7b883657..3d9d651d 100644
--- a/models/ColorModel.cpp
+++ b/models/ColorModel.cpp
@@ -797,18 +797,22 @@ void ScaLBL_ColorModel::Run(){
 				if (CURRENT_STEADY_TIMESTEPS > MAX_STEADY_TIMESTEPS)
 					isSteady = true;
 				if (RESCALE_FORCE == true && SET_CAPILLARY_NUMBER == true && CURRENT_STEADY_TIMESTEPS > RESCALE_FORCE_AFTER_TIMESTEP){
-					RESCALE_FORCE = false;
-					Fx *= capillary_number / Ca;
-					Fy *= capillary_number / Ca;
-					Fz *= capillary_number / Ca;
-					if (force_mag > 1e-3){
-						Fx *= 1e-3/force_mag;   // impose ceiling for stability
-						Fy *= 1e-3/force_mag;   
-						Fz *= 1e-3/force_mag;   
-					}
-					if (rank == 0) printf("    -- adjust force by factor %f \n ",capillary_number / Ca);
-					Averages->SetParams(rhoA,rhoB,tauA,tauB,Fx,Fy,Fz,alpha,beta);
-					color_db->putVector<double>("F",{Fx,Fy,Fz});
+				  RESCALE_FORCE = false;
+				  double RESCALE_FORCE_FACTOR = capillary_number / Ca;
+				  if (RESCALE_FORCE_FACTOR > 2.0) RESCALE_FORCE_FACTOR = 2.0;
+				  if (RESCALE_FORCE_FACTOR < 0.5) RESCALE_FORCE_FACTOR = 0.5;
+				  Fx *= RESCALE_FORCE_FACTOR;
+				  Fy *= RESCALE_FORCE_FACTOR;
+				  Fz *= RESCALE_FORCE_FACTOR;
+				  force_mag = sqrt(Fx*Fx+Fy*Fy+Fz*Fz);
+				  if (force_mag > 1e-3){
+				    Fx *= 1e-3/force_mag;   // impose ceiling for stability
+				    Fy *= 1e-3/force_mag;   
+				    Fz *= 1e-3/force_mag;   
+				  }
+				  if (rank == 0) printf("    -- adjust force by factor %f \n ",capillary_number / Ca);
+				  Averages->SetParams(rhoA,rhoB,tauA,tauB,Fx,Fy,Fz,alpha,beta);
+				  color_db->putVector<double>("F",{Fx,Fy,Fz});
 				}
 				if ( isSteady ){
 					MORPH_ADAPT = true;
diff --git a/sample_scripts/configure_summit b/sample_scripts/configure_summit
index 99d17cd0..bcd8a221 100755
--- a/sample_scripts/configure_summit
+++ b/sample_scripts/configure_summit
@@ -7,6 +7,7 @@ module load cuda
 
 export HDF5_DIR=/ccs/proj/csc380/mcclurej/install/hdf5/1.8.12/
 export SILO_DIR=/ccs/proj/csc380/mcclurej/install/silo/4.10.2/
+export NETCDF_DIR=/ccs/proj/geo136/install/netcdf/4.6.1
 
 # configure
 rm -rf CMake*
@@ -28,6 +29,8 @@ cmake                                       \
      -D USE_SILO=1                        \
         -D SILO_LIB="$SILO_DIR/lib/libsiloh5.a"    \
    	-D SILO_DIRECTORY="$SILO_DIR"		     \
+    -D USE_NETCDF=1				     \
+        -D NETCDF_DIRECTORY="$NETCDF_DIR"	     \
     -D USE_DOXYGEN:BOOL=false		        \
     -D USE_TIMER=0			                \
     ~/LBPM-WIA