Changes for BOMEX..PR in progress. #589
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…o_and_fluxes Conflicts: mpi-tests/test_parcel_split_random.f90 src/3d/boundary_layer/bndry_fluxes.f90 src/3d/parcels/parcel_merge.f90 unit-tests/3d/test_mpi_nearest_1.f90 unit-tests/3d/test_mpi_nearest_10.f90 unit-tests/3d/test_mpi_nearest_11.f90 unit-tests/3d/test_mpi_nearest_12.f90 unit-tests/3d/test_mpi_nearest_13.f90 unit-tests/3d/test_mpi_nearest_14.f90 unit-tests/3d/test_mpi_nearest_15.f90 unit-tests/3d/test_mpi_nearest_16.f90 unit-tests/3d/test_mpi_nearest_17.f90 unit-tests/3d/test_mpi_nearest_18.f90 unit-tests/3d/test_mpi_nearest_19.f90 unit-tests/3d/test_mpi_nearest_2.f90 unit-tests/3d/test_mpi_nearest_20.f90 unit-tests/3d/test_mpi_nearest_3.f90 unit-tests/3d/test_mpi_nearest_4.f90 unit-tests/3d/test_mpi_nearest_5.f90 unit-tests/3d/test_mpi_nearest_6.f90 unit-tests/3d/test_mpi_nearest_7.f90 unit-tests/3d/test_mpi_nearest_8.f90 unit-tests/3d/test_mpi_nearest_9.f90 unit-tests/3d/test_mpi_parcel_communicate.f90 unit-tests/3d/test_mpi_parcel_read_rejection.f90 unit-tests/3d/test_mpi_parcel_split.f90 unit-tests/3d/test_mpi_parcel_write.f90
correct saturation adjustmet at every substep
Conflicts: mpi-tests/test_parcel_merge_random.f90 mpi-tests/test_parcel_split_random.f90 src/3d/epic3d.f90 src/3d/fields/field_diagnostics.f90 src/3d/fields/field_netcdf.f90 src/3d/fields/fields.f90 src/3d/parcels/parcel_container.f90 src/3d/parcels/parcel_damping.f90 src/3d/parcels/parcel_interpl.f90 src/3d/parcels/parcel_netcdf.f90 src/3d/stepper/ls_rk.f90 src/3d/stepper/rk_utils.f90
…e_1024 Conflicts: src/3d/fields/field_netcdf.f90 src/3d/parcels/parcel_netcdf.f90
added 5 commits
October 25, 2024 14:59
Conflicts: src/3d/boundary_layer/bndry_fluxes.f90 src/3d/parcels/parcel_interpl.f90
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.