Fixed more bad merges

MintonGroup · Jul 23, 2021 · d681cc4 · d681cc4
1 parent eb476c1
commit d681cc4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/src/io/io_ejecta_table.f90 b/src/io/io_ejecta_table.f90
@@ -41,7 +41,7 @@ subroutine io_ejecta_table(crater,domain,ejb,ejtble,filename)
       write(LUN,'(A63)') '# "r (m)"     "h (m)"      "v (m/s)"    "ang (deg)"  "erad (m)"'
       do k=1,ejtble 
          write(LUN,'(5(ES13.5E3,1X))') exp(ejb(k)%lrad),exp(ejb(k)%thick),sqrt(ejb(k)%vesq),ejb(k)%angle/DEG2RAD, &
-                                     ejb(k)%erad
+                                     exp(ejb(k)%erad)
       end do
    close(LUN)
 

diff --git a/src/io/io_input.f90 b/src/io/io_input.f90
@@ -77,16 +77,18 @@ subroutine io_input(infile,user)
    user%doscour = .false.
    user%tallyonly = .false.
    user%dosoftening = .true.
+   user%dorays = .false.
+   user%superdomain = .true.
    user%doregotrack = .false.
    user%basinimp = huge(0._DP)
    user%maxcrat = 1.00_DP
    user%doangle = .true.
    user%testtally = .false.
    user%killatmaxcrater = .false.
    user%doporosity = .false.
-   user%soften_factor = 0.9_DP
-   user%soften_slope = 1.8_DP
-   user%soften_size  = 30.0_DP
+   user%Kd1 = 0.00_DP
+   user%psi = 2.0_DP
+   user%fe  = 1.0_DP
    user%ejecta_truncation = 10.0_DP
    user%doquasimc = .false.
    user%discontinuous = .true.
@@ -281,6 +283,16 @@ subroutine io_input(infile,user)
             call io_get_token(line, ilength, ifirst, ilast, ierr)
             token = line(ifirst:ilast)
             read(token, *) user%dosoftening
+         case ("DORAYS")
+            ifirst = ilast + 1
+            call io_get_token(line, ilength, ifirst, ilast, ierr)
+            token = line(ifirst:ilast)
+            read(token, *) user%dorays
+         case ("SUPERDOMAIN")
+            ifirst = ilast + 1
+            call io_get_token(line, ilength, ifirst, ilast, ierr)
+            token = line(ifirst:ilast)
+            read(token, *) user%superdomain
          case ("DOREGOTRACK")
             ifirst = ilast + 1
             call io_get_token(line, ilength, ifirst, ilast, ierr)
@@ -312,15 +324,15 @@ subroutine io_input(infile,user)
             token = line(ifirst:ilast)
             read(token, *) user%testtally
          case ("EJECTA_TRUNCATION") ! Radius of ejecta blankets to model in terms of crater radius
-              ifirst = ilast + 1
-              call io_get_token(line, ilength, ifirst, ilast, ierr)
-              token = line(ifirst:ilast)
-              read(token, *) user%ejecta_truncation
-         case ("DISCONTINUOUS") ! Do discontinuous ejecta blanket
             ifirst = ilast + 1
             call io_get_token(line, ilength, ifirst, ilast, ierr)
             token = line(ifirst:ilast)
-            read(token, *) user%discontinuous
+            read(token, *) user%ejecta_truncation
+         case ("DISCONTINUOUS") 
+            ifirst = ilast + 1
+            call io_get_token(line, ilength, ifirst, ilast, ierr)
+            token = line(ifirst:ilast)
+            read(token, *) user%discontinuous   
          ! Porosity model
          case ("POROSITYFLG")
             ifirst = ilast + 1
@@ -442,21 +454,21 @@ subroutine io_input(infile,user)
             token = line(ifirst:ilast)
             read(token, *) user%shadedmaxh
             read(token, *) user%shadedminh
-         case ("SOFTEN_FACTOR")
+         case ("KD1")
             ifirst = ilast + 1
             call io_get_token(line, ilength, ifirst, ilast, ierr)
             token = line(ifirst:ilast)
-            read(token, *) user%soften_factor
-         case ("SOFTEN_SLOPE")
+            read(token, *) user%Kd1
+         case ("PSI")
             ifirst = ilast + 1
             call io_get_token(line, ilength, ifirst, ilast, ierr)
             token = line(ifirst:ilast)
-            read(token, *) user%soften_slope
-         case ("SOFTEN_SIZE")
+            read(token, *) user%psi
+         case ("FE")
             ifirst = ilast + 1
             call io_get_token(line, ilength, ifirst, ilast, ierr)
             token = line(ifirst:ilast)
-            read(token, *) user%soften_size
+            read(token, *) user%fe
          !**************************************************************************
          ! The following is for backwards compatibility with older style input files
          !**************************************************************************