Pull 4.19-devel into 5.0-devel

epoch1d/Makefile

@@ -420,11 +420,11 @@ visitclean:
 
 sdfutils:
 	@cd $(SDF)/../C; make
-	@cd $(SDF)/../utilities; ./build
+	@cd $(SDF)/../utilities; ./build.sh
 
 sdfutilsclean:
 	@cd $(SDF)/../C; make clean
-	@cd $(SDF)/../utilities; ./build -c
+	@cd $(SDF)/../utilities; ./build.sh -c
 
 sdf_reader_example: $(BINDIR)/sdf_reader_example
 

epoch1d/src/deck/deck_qed_block.F90

@@ -155,6 +155,23 @@ FUNCTION qed_block_handle_element(element, value) RESULT(errcode)
       RETURN
     END IF
 
+    IF(str_cmp(element, 'semiclassical_photon_emission')) THEN
+       use_continuous_emission = as_logical_print(value, element, errcode)
+       RETURN
+    END IF
+
+    IF(str_cmp(element, 'classical_photon_emission')) THEN  
+      use_classical_emission = as_logical_print(value, element, errcode)
+      RETURN
+    END IF
+
+    IF (str_cmp(element, 'photon_sample_fraction') &
+        .OR. str_cmp(element, 'photon_downsampling')) THEN
+      photon_sample_fraction = as_real_print(value, element, errcode)
+      IF (photon_sample_fraction > 1.0) photon_sample_fraction = 1.0
+      RETURN
+    END IF
+
     errcode = c_err_unknown_element
 #endif
 
@@ -186,6 +203,22 @@ FUNCTION qed_block_check() RESULT(errcode)
       END IF
       errcode = c_err_bad_value + c_err_terminate
     END IF
+
+    ! Handling for different combinations of semiclassical and classical emission
+    IF (use_continuous_emission .AND. use_classical_emission) THEN
+      IF (rank == 0) THEN
+        DO iu = 1, nio_units ! Print to stdout and to file
+          io = io_units(iu)
+          WRITE(io,*)
+          WRITE(io,*) '*** WARNING ***'
+          WRITE(io,*) 'You cannot have both classical_photon_emission=T ', &
+            'and semiclassical_photon_emission=T. Assuming only ', &
+            'classical emission=T.'
+        END DO
+      END IF
+    END IF
+    use_continuous_emission = (use_continuous_emission &
+                               .OR. use_classical_emission)
 #endif
 
   END FUNCTION qed_block_check

epoch1d/src/housekeeping/utilities.f90

@@ -343,7 +343,7 @@ END FUNCTION get_free_lun
   SUBROUTINE setup_grid_x
 
     INTEGER :: iproc
-    REAL(num) :: boundary_shift
+    REAL(num) :: boundary_shift, hdx
 
     ! Setup local grid
     x(1-ng:nx+ng) = x_global(nx_global_min-ng:nx_global_max+ng)
@@ -357,8 +357,12 @@ SUBROUTINE setup_grid_x
     x_grid_min_local = x_grid_mins(x_coords)
     x_grid_max_local = x_grid_maxs(x_coords)
 
-    x_min_local = x_grid_min_local + (cpml_x_min_offset - 0.5_num) * dx
-    x_max_local = x_grid_max_local - (cpml_x_max_offset - 0.5_num) * dx
+    hdx = 0.5_num * dx
+    x_min_local = x_grid_min_local - hdx
+    x_max_local = x_global(cell_x_max(x_coords+1)+1) - hdx
+
+    x_min_local = x_min_local + cpml_x_min_offset * dx
+    x_max_local = x_max_local - cpml_x_max_offset * dx
 
     boundary_shift = REAL((1 + png + cpml_thickness) / 2, num)
     x_min_outer = x_min - boundary_shift * dx

epoch1d/src/physics_packages/TABLES/chimin.table

@@ -1,100 +1,201 @@
-5.000000000000005e-18
-5.748784976988682e-18
-6.609705742330147e-17
-7.599555414764671e-17
-8.737642000038419e-17
-1.0046165012825234e-16
-1.1550648500415796e-16
-1.3280438914733428e-16
-1.5269277544167071e-16
-1.7555958671075646e-16
-2.0185086292982803e-16
-2.3207944168063924e-16
-2.668349615603158e-16
-3.0679536367065896e-16
-3.527401155359325e-16
-4.0556541539484385e-16
-4.663016734416101e-16
-5.36133611005162e-16
-6.164233697210334e-16
-7.087370814634028e-15
-8.14875417310322e-15
-9.369087114301921e-15
-1.0772173450159427e-14
-1.2385381779958563e-14
-1.4240179342179017e-14
-1.6372745814388645e-14
-1.882467903396235e-14
-2.164380640541532e-14
-2.4885117821660584e-14
-2.8611838296751115e-14
-3.289666123287843e-14
-3.7823166377731474e-14
-4.348745013088919e-14
-5.000000000000003e-14
-5.74878497698868e-14
-6.609705742330146e-13
-7.599555414764669e-13
-8.737642000038428e-13
-1.0046165012825246e-12
-1.1550648500415807e-12
-1.3280438914733442e-12
-1.5269277544167088e-12
-1.7555958671075664e-12
-2.018508629298278e-12
-2.3207944168063927e-12
-2.668349615603157e-12
-3.0679536367065898e-12
-3.5274011553593237e-12
-4.055654153948439e-12
-4.663016734416103e-12
-5.361336110051618e-12
-6.1642336972103326e-12
-7.087370814634029e-11
-8.148754173103228e-11
-9.369087114301928e-11
-1.077217345015943e-10
-1.238538177995856e-10
-1.4240179342179016e-10
-1.6372745814388652e-10
-1.8824679033962347e-10
-2.1643806405415319e-10
-2.488511782166058e-10
-2.8611838296751113e-10
-3.289666123287843e-10
-3.782316637773148e-10
-4.348745013088919e-10
-5.000000000000002e-10
-5.748784976988679e-10
-6.609705742330145e-10
-7.599555414764668e-10
-8.73764200003842e-9
-1.0046165012825233e-8
-1.1550648500415795e-8
-1.3280438914733451e-8
-1.5269277544167097e-8
-1.7555958671075678e-8
-2.0185086292982796e-8
-2.320794416806392e-8
-2.668349615603157e-8
-3.0679536367065895e-8
-3.527401155359324e-8
-4.0556541539484376e-8
-4.663016734416101e-8
-5.361336110051616e-8
-6.164233697210331e-8
-7.087370814634027e-8
-8.14875417310322e-8
-9.36908711430192e-8
-1.0772173450159437e-7
-1.2385381779958575e-7
-1.424017934217903e-7
-1.6372745814388664e-7
-1.8824679033962364e-7
-2.1643806405415316e-7
-2.4885117821660575e-7
-2.8611838296751113e-7
-3.289666123287843e-7
-3.782316637773147e-7
-4.3487450130889195e-7
-5.000000000000002e-7
+9.999999999999998e-23
+1.258925411794166e-22
+1.584893192461111e-22
+1.995262314968875e-22
+2.511886431509571e-22
+3.162277660168379e-22
+3.981071705534969e-22
+5.011872336272715e-22
+6.309573444801917e-22
+7.943282347242820e-22
+1.000000000000000e-21
+1.258925411794166e-21
+1.584893192461111e-21
+1.995262314968874e-21
+2.511886431509582e-21
+3.162277660168379e-21
+3.981071705534968e-21
+5.011872336272714e-21
+6.309573444801916e-21
+7.943282347242822e-21
+9.999999999999999e-21
+1.258925411794166e-20
+1.584893192461110e-20
+1.995262314968879e-20
+2.511886431509577e-20
+3.162277660168380e-20
+3.981071705534969e-20
+5.011872336272714e-20
+6.309573444801930e-20
+7.943282347242806e-20
+1.000000000000000e-19
+1.258925411794166e-19
+1.584893192461111e-19
+1.995262314968879e-19
+2.511886431509577e-19
+3.162277660168380e-19
+3.981071705534969e-19
+5.011872336272713e-19
+6.309573444801930e-19
+7.943282347242804e-19
+9.999999999999999e-19
+1.258925411794166e-18
+1.584893192461111e-18
+1.995262314968879e-18
+2.511886431509577e-18
+3.162277660168379e-18
+3.981071705534970e-18
+5.011872336272715e-18
+6.309573444801929e-18
+7.943282347242806e-18
+1.000000000000000e-17
+1.258925411794166e-17
+1.584893192461111e-17
+1.995262314968879e-17
+2.511886431509577e-17
+3.162277660168380e-17
+3.981071705534969e-17
+5.011872336272724e-17
+6.309573444801930e-17
+7.943282347242806e-17
+1.000000000000000e-16
+1.258925411794166e-16
+1.584893192461113e-16
+1.995262314968879e-16
+2.511886431509580e-16
+3.162277660168380e-16
+3.981071705534969e-16
+5.011872336272719e-16
+6.309573444801929e-16
+7.943282347242813e-16
+9.999999999999999e-16
+1.258925411794166e-15
+1.584893192461113e-15
+1.995262314968879e-15
+2.511886431509580e-15
+3.162277660168379e-15
+3.981071705534969e-15
+5.011872336272720e-15
+6.309573444801930e-15
+7.943282347242814e-15
+1.000000000000000e-14
+1.258925411794167e-14
+1.584893192461114e-14
+1.995262314968878e-14
+2.511886431509579e-14
+3.162277660168378e-14
+3.981071705534971e-14
+5.011872336272722e-14
+6.309573444801930e-14
+7.943282347242813e-14
+1.000000000000000e-13
+1.258925411794167e-13
+1.584893192461113e-13
+1.995262314968879e-13
+2.511886431509579e-13
+3.162277660168379e-13
+3.981071705534973e-13
+5.011872336272723e-13
+6.309573444801932e-13
+7.943282347242816e-13
+1.000000000000000e-12
+1.122018454301963e-12
+1.258925411794167e-12
+1.412537544622754e-12
+1.584893192461114e-12
+1.778279410038923e-12
+1.995262314968880e-12
+2.238721138568340e-12
+2.511886431509580e-12
+2.818382931264454e-12
+3.162277660168379e-12
+3.548133892335755e-12
+3.981071705534973e-12
+4.466835921509631e-12
+5.011872336272724e-12
+5.623413251903491e-12
+6.309573444801933e-12
+7.079457843841380e-12
+7.943282347242815e-12
+8.912509381337456e-12
+9.999999999999999e-12
+1.122018454301964e-11
+1.258925411794167e-11
+1.412537544622755e-11
+1.584893192461114e-11
+1.778279410038923e-11
+1.995262314968880e-11
+2.238721138568340e-11
+2.511886431509581e-11
+2.818382931264455e-11
+3.162277660168379e-11
+3.548133892335755e-11
+3.981071705534973e-11
+4.466835921509632e-11
+5.011872336272725e-11
+5.623413251903491e-11
+6.309573444801932e-11
+7.079457843841380e-11
+7.943282347242817e-11
+8.912509381337459e-11
+1.000000000000000e-10
+1.122018454301964e-10
+1.258925411794167e-10
+1.412537544622754e-10
+1.584893192461114e-10
+1.778279410038923e-10
+1.995262314968881e-10
+2.238721138568340e-10
+2.511886431509582e-10
+2.818382931264455e-10
+3.162277660168379e-10
+3.548133892335756e-10
+3.981071705534973e-10
+4.466835921509635e-10
+5.011872336272725e-10
+5.623413251903490e-10
+6.309573444801936e-10
+7.079457843841380e-10
+7.943282347242821e-10
+8.912509381337459e-10
+1.000000000000000e-09
+1.122018454301964e-09
+1.258925411794168e-09
+1.412537544622755e-09
+1.584893192461114e-09
+1.778279410038923e-09
+1.995262314968881e-09
+2.238721138568340e-09
+2.511886431509582e-09
+2.818382931264455e-09
+3.162277660168380e-09
+3.548133892335757e-09
+3.981071705534973e-09
+4.466835921509635e-09
+5.011872336272725e-09
+5.623413251903491e-09
+6.309573444801936e-09
+7.079457843841381e-09
+7.943282347242822e-09
+8.912509381337458e-09
+1.000000000000000e-08
+1.122018454301963e-08
+1.258925411794169e-08
+1.412537544622755e-08
+1.584893192461114e-08
+1.778279410038922e-08
+1.995262314968879e-08
+2.238721138568342e-08
+2.511886431509582e-08
+2.818382931264455e-08
+3.162277660168379e-08
+3.548133892335753e-08
+3.981071705534977e-08
+4.466835921509635e-08
+5.011872336272725e-08
+5.623413251903490e-08
+6.309573444801943e-08
+7.079457843841387e-08
+7.943282347242822e-08
+8.912509381337459e-08
+1.000000000000000e-07