diff --git a/docs/source/conf.py b/docs/source/conf.py index c4c300cc..b7f2feae 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -78,9 +78,9 @@ # built documents. # # The short X.Y version. -version = u'1.2.0' +version = u'1.2.1' # The full version, including alpha/beta/rc tags. -release = u'1.2.0' +release = u'1.2.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/falwa/__init__.py b/falwa/__init__.py index 8b1926c0..5bc4f531 100644 --- a/falwa/__init__.py +++ b/falwa/__init__.py @@ -4,7 +4,7 @@ Author: Clare Huang, Christopher Polster """ -__version__ = "1.2.0" +__version__ = "1.2.1" from .interpolate_fields import interpolate_fields from .interpolate_fields_direct_inv import interpolate_fields_direct_inv from .compute_qref_and_fawa_first import compute_qref_and_fawa_first diff --git a/falwa/f90_modules/compute_flux_dirinv.f90 b/falwa/f90_modules/compute_flux_dirinv.f90 index 4039e8ef..5d457c32 100644 --- a/falwa/f90_modules/compute_flux_dirinv.f90 +++ b/falwa/f90_modules/compute_flux_dirinv.f90 @@ -178,19 +178,17 @@ SUBROUTINE compute_flux_dirinv_nshem(pv,uu,vv,pt,tn0,qref,uref,tref,& ep2baro(:,:) = ep2baro(:,:)+ep2(:,:)*exp(-zk/h)*dc ep3baro(:,:) = ep3baro(:,:)+ep3(:,:)*exp(-zk/h)*dc - ! Bounds of y-indices in N/SHem - if (is_nhem) then ! 5N and higher latitude - jstart = jb+1 ! 6 - jend = nd + if (is_nhem) then + do j = jstart,jend + ubaro(:,j) = ubaro(:,j)+uu(:,nd-1+j,k)*exp(-zk/h)*dc + urefbaro(j) = urefbaro(j)+uref(j-jb,k)*exp(-zk/h)*dc + enddo else - jstart = 1 - jend = nd-jb ! nd - 5 + do j = jstart,jend + ubaro(:,j) = ubaro(:,j)+uu(:,j,k)*exp(-zk/h)*dc + urefbaro(j) = urefbaro(j)+uref(j,k)*exp(-zk/h)*dc + enddo endif - - do j = jstart,jend ! ### yet to be multiplied by cosine - ubaro(:,j) = ubaro(:,j)+uu(:,j+nd-1,k)*exp(-zk/h)*dc - urefbaro(j) = urefbaro(j)+uref(j-jb,k)*exp(-zk/h)*dc - enddo enddo END SUBROUTINE diff --git a/notebooks/nh2018_science/demo_script_for_nh2018.ipynb b/notebooks/nh2018_science/demo_script_for_nh2018.ipynb index fc47376d..09f7978d 100644 --- a/notebooks/nh2018_science/demo_script_for_nh2018.ipynb +++ b/notebooks/nh2018_science/demo_script_for_nh2018.ipynb @@ -27,17 +27,17 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 15, "metadata": { - "ExecuteTime": { - "end_time": "2023-11-05T18:59:48.705818Z", - "start_time": "2023-11-05T18:59:48.627671Z" - }, "execution": { "iopub.execute_input": "2023-12-21T05:03:56.260040Z", "iopub.status.busy": "2023-12-21T05:03:56.259788Z", "iopub.status.idle": "2023-12-21T05:04:58.910949Z", "shell.execute_reply": "2023-12-21T05:04:58.910157Z" + }, + "ExecuteTime": { + "end_time": "2024-01-20T02:06:28.682002Z", + "start_time": "2024-01-20T02:06:28.664072Z" } }, "outputs": [], @@ -68,17 +68,17 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 16, "metadata": { - "ExecuteTime": { - "end_time": "2023-11-05T18:59:48.736124Z", - "start_time": "2023-11-05T18:59:48.708830Z" - }, "execution": { "iopub.execute_input": "2023-12-21T05:04:58.915124Z", "iopub.status.busy": "2023-12-21T05:04:58.914776Z", "iopub.status.idle": "2023-12-21T05:05:01.230876Z", "shell.execute_reply": "2023-12-21T05:05:01.229807Z" + }, + "ExecuteTime": { + "end_time": "2024-01-20T02:06:28.832529Z", + "start_time": "2024-01-20T02:06:28.669188Z" } }, "outputs": [], @@ -92,476 +92,26 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 17, "metadata": { - "ExecuteTime": { - "end_time": "2023-11-05T18:59:48.755104Z", - "start_time": "2023-11-05T18:59:48.733745Z" - }, "execution": { "iopub.execute_input": "2023-12-21T05:05:01.234888Z", "iopub.status.busy": "2023-12-21T05:05:01.234620Z", "iopub.status.idle": "2023-12-21T05:05:02.805392Z", "shell.execute_reply": "2023-12-21T05:05:02.804736Z" + }, + "ExecuteTime": { + "end_time": "2024-01-20T02:06:28.939506Z", + "start_time": "2024-01-20T02:06:28.833372Z" } }, "outputs": [ { "data": { - "text/html": [ - "
<xarray.Dataset>\n", - "Dimensions: (longitude: 240, latitude: 121, level: 37, time: 32)\n", - "Coordinates:\n", - " * longitude (longitude) float32 0.0 1.5 3.0 4.5 ... 354.0 355.5 357.0 358.5\n", - " * latitude (latitude) float32 90.0 88.5 87.0 85.5 ... -87.0 -88.5 -90.0\n", - " * level (level) int32 1 2 3 5 7 10 20 30 ... 850 875 900 925 950 975 1000\n", - " * time (time) datetime64[ns] 2005-01-23 ... 2005-01-30T18:00:00\n", - "Data variables:\n", - " u (time, level, latitude, longitude) float32 ...\n", - "Attributes:\n", - " Conventions: CF-1.6\n", - " history: 2018-07-17 16:50:39 GMT by grib_to_netcdf-2.8.0: grib_to_ne...
<xarray.Dataset>\nDimensions: (longitude: 240, latitude: 121, level: 37, time: 32)\nCoordinates:\n * longitude (longitude) float32 0.0 1.5 3.0 4.5 ... 354.0 355.5 357.0 358.5\n * latitude (latitude) float32 90.0 88.5 87.0 85.5 ... -87.0 -88.5 -90.0\n * level (level) int32 1 2 3 5 7 10 20 30 ... 850 875 900 925 950 975 1000\n * time (time) datetime64[ns] 2005-01-23 ... 2005-01-30T18:00:00\nData variables:\n u (time, level, latitude, longitude) float32 ...\nAttributes:\n Conventions: CF-1.6\n history: 2018-07-17 16:50:39 GMT by grib_to_netcdf-2.8.0: grib_to_ne...