Merge pull request #4 from dajwahl/patch-1

Variable name (F_sedmin) and MRD output width
katerinaziot · Jun 2, 2023 · d1a28ee · d1a28ee
2 parents 9d7863f + 8af8815
commit d1a28ee
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/PM4Sand_Cyclic_DSS_drained_batch/DSS_cyclic_drained.fis b/PM4Sand_Cyclic_DSS_drained_batch/DSS_cyclic_drained.fis
@@ -144,7 +144,7 @@ def $asssign_secondary ; Assign the secondary parameters - separated just for il
 				          z_max  = $zmax   c_e   = $ce     c_z      = $cz       &
 				          phi_cv = $phicv  pois  = $pois   G_degr   = $Gdegr    &
 				          C_DR   = $CDR    C_kaf = $Ckaf   Q_bolt   = $Q        &
-				          R_bolt = $R      m_par = $m      F_sedmin = $Fsed     & 
+				          R_bolt = $R      m_par = $m      F_sed    = $Fsed     & 
 				          p_sedo = $psedo  i=$i j=$j	  
             endcommand
         endloop
@@ -483,11 +483,11 @@ def $mod_damp_out
         loop $cyc (1,$Ncycles) 
 			$iii   = ($limits-1)*$Ncycles + $cyc
 			$strainPercent = $Strain_limit($limits) * 100
-			$data(1,1)   =    string($strainPercent)+ '  '
+			$data(1,1)   =    fstring($strainPercent,3)+ '  '
 			loop $n (1,5)
-				$data(1,1) = $data(1,1) + string($GSecant($iii,$n))   + '  '  
-				$data(1,1) = $data(1,1) + string($G_Gmax($iii,$n))    + '  '  
-				$data(1,1) = $data(1,1) + string($dampRatio($iii,$n)) + '  '  
+				$data(1,1) = $data(1,1) + fstring($GSecant($iii,$n),3)   + '  '  
+				$data(1,1) = $data(1,1) + fstring($G_Gmax($iii,$n),3)    + '  '  
+				$data(1,1) = $data(1,1) + fstring($dampRatio($iii,$n),3) + '  '  
 			endloop
 			if status = 0 
 				status = write($data,1) 

diff --git a/PM4Sand_Monotonic_batch/DSS_monotonic.fis b/PM4Sand_Monotonic_batch/DSS_monotonic.fis
@@ -138,7 +138,7 @@ def $asssign_secondary ; Assign the secondary parameters - separated just for il
 				          z_max  = $zmax   c_e   = $ce     c_z      = $cz    &
 				          phi_cv = $phicv  pois  = $pois   G_degr   = $Gdegr &
 				          C_DR   = $CDR    C_kaf = $Ckaf   Q_bolt   = $Q     &
-				          R_bolt = $R      m_par = $m      F_sedmin = $Fsed  & 
+				          R_bolt = $R      m_par = $m      F_sed    = $Fsed  & 
 				          p_sedo = $psedo  i=$i j=$j	  
             endcommand
         endloop

diff --git a/PM4Sand_Monotonic_batch/PSC_monotonic.fis b/PM4Sand_Monotonic_batch/PSC_monotonic.fis
@@ -148,7 +148,7 @@ def $asssign_secondary ; Assign the secondary parameters - separated just for il
                   z_max  = $zmax   c_e   = $ce     c_z      = $cz    &
                   phi_cv = $phicv  pois  = $pois   G_degr   = $Gdegr &
                   C_DR   = $CDR    C_kaf = $Ckaf   Q_bolt   = $Q     &
-                  R_bolt = $R      m_par = $m      F_sedmin = $Fsed  & 
+                  R_bolt = $R      m_par = $m      F_sed    = $Fsed  & 
                   p_sedo = $psedo  i=$i j=$j    
             endcommand
         endloop

diff --git a/PM4Sand_Reconsolidation_batch/DSS_reconsolidation.fis b/PM4Sand_Reconsolidation_batch/DSS_reconsolidation.fis
@@ -156,7 +156,7 @@ def $asssign_secondary ; Assign the secondary parameters - separated just for il
 				          z_max  = $zmax   c_e   = $ce     c_z      = $cz    &
 				          phi_cv = $phicv  pois  = $pois   G_degr   = $Gdegr &
 				          C_DR   = $CDR    C_kaf = $Ckaf   Q_bolt   = $Q     &
-				          R_bolt = $R      m_par = $m      F_sedmin = $Fsed  & 
+				          R_bolt = $R      m_par = $m      F_sed    = $Fsed  & 
 				          p_sedo = $psedo  i=$i j=$j	  
             endcommand
         endloop