Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New monsoon sperber code in xCDAT -- PR cleaned up #1022

Merged
merged 53 commits into from
Jun 22, 2024
Merged

New monsoon sperber code in xCDAT -- PR cleaned up #1022

merged 53 commits into from
Jun 22, 2024

Conversation

lee1043
Copy link
Contributor

@lee1043 lee1043 commented Jan 16, 2024

This PR is for monsoon_sperber code that is converted to use xcdat (update by @bosup).
A new branch is made by @lee1043 for clean up the previous PR (#1011).

@lee1043 lee1043 mentioned this pull request Jan 16, 2024
Closed
@lee1043 lee1043 added this to the 3.3 milestone Jan 16, 2024
@lee1043 lee1043 linked an issue Jan 16, 2024 that may be closed by this pull request
Implement xCDAT for PMP's Monsoon Sperber Metrics #925
Closed
@lee1043
Copy link
Contributor Author

lee1043 commented Jan 16, 2024

@bosup I found the difference in the output. Can you investigate where that is coming from and if they could be more consistent?

Metrics calculated from the previous version of the code (shown from Demo_2b_notebook):

{
  "GISS-E2-H": {
    "r1i1p1": {
      "AIR": {
        "decay_index": 53,
        "duration": 17,
        "onset_index": 37,
        "slope": 0.037490989405760906
      },
      "AUS": {
        "decay_index": 52,
        "duration": 22,
        "onset_index": 31,
        "slope": 0.028602770104420926
      },
      "GoG": {
        "decay_index": 49,
        "duration": 24,
        "onset_index": 26,
        "slope": 0.017398272573029495
      },
      "NAmo": {
        "decay_index": 64,
        "duration": 52,
        "onset_index": 13,
        "slope": 0.012011903431421198
      },
      "SAmo": {
        "decay_index": 56,
        "duration": 30,
        "onset_index": 27,
        "slope": 0.020883715095941786
      },
      "Sahel": {
        "decay_index": 47,
        "duration": 17,
        "onset_index": 31,
        "slope": 0.03490883309967567
      }
    }
  }
}

Metrics calculated from the code in this PR:

{
  "GISS-E2-H": {
    "r1i1p1": {
      "AIR": {
        "decay_index": 54,
        "duration": 20,
        "onset_index": 35,
        "slope": 0.032632458420097696
      },
      "AUS": {
        "decay_index": 54,
        "duration": 23,
        "onset_index": 32,
        "slope": 0.0272846353443767
      },
      "GoG": {
        "decay_index": 48,
        "duration": 23,
        "onset_index": 26,
        "slope": 0.01760572910784664
      },
      "NAmo": {
        "decay_index": 63,
        "duration": 51,
        "onset_index": 13,
        "slope": 0.011989028721760442
      },
      "SAmo": {
        "decay_index": 56,
        "duration": 31,
        "onset_index": 26,
        "slope": 0.020573642677988356
      },
      "Sahel": {
        "decay_index": 48,
        "duration": 18,
        "onset_index": 31,
        "slope": 0.03399930925007501
      }
    }
  }
}

@lee1043 lee1043 modified the milestones: 3.3, 3.4 Jan 26, 2024
bosup and others added 18 commits February 5, 2024 22:03
@bosup
modified: driver_monsoon_sperber.py
c1f950b 
	new file:   param/Bo_param.py
	modified:   param/myParam.py

 Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   lib/argparse_functions.py
	modified:   ../../share/DefArgsCIA.json

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	test_ACCESS1-0_afterMask.png
	test_ACCESS1-0_beforeMask.png
	test_obs_afterMask.png
	test_obs_beforeMask.png
@bosup
modified: lib/argparse_functions.py
97aecc3
@bosup
modified: ../../share/DefArgsCIA.json
09aaeaf 
 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	test_ACCESS1-0_afterMask.png
	test_ACCESS1-0_beforeMask.png
	test_obs_afterMask.png
	test_obs_beforeMask.png
@bosup
modified: driver_monsoon_sperber.py
6692788 
	modified:   param/Bo_param.py
@bosup
modified: driver_monsoon_sperber.py
2f66f5b
@bosup
modified: driver_monsoon_sperber.py
3d9dd77
@bosup
modified: driver_monsoon_sperber.py
8eefb97
@bosup
modified: driver_monsoon_sperber.py
e68a0a0
@bosup
Merge branch 'main' into new_monsoon_lee1043_clean_up
b915245
@bosup
Merge remote-tracking branch 'origin/main' into new_monsoon_lee1043_c…
22a50f4 
…lean_up
@bosup
modified: driver_monsoon_sperber.py
08170a1
@bosup
modified: lib/model_land_only.py
aa2f7c5
@bosup
modified: driver_monsoon_sperber.py
23ee2e8
@bosup
modified: driver_monsoon_sperber.py
3d44dc4
@bosup
modified: driver_monsoon_sperber.py
68a5fcb
@bosup
modified: driver_monsoon_sperber.py
2f1f442
@bosup
modified: driver_monsoon_sperber.py
93d8ff2
@lee1043
Merge branch 'main' into new_monsoon_lee1043_clean_up
1e7bd3d
@lee1043 lee1043 marked this pull request as ready for review April 6, 2024 01:56
@lee1043
Copy link
Contributor Author

lee1043 commented Apr 6, 2024

@bosup informed that this PR is ready for review (thanks!). @lee1043 will start reviewing it.

@lee1043
Copy link
Contributor Author

lee1043 commented Apr 8, 2024

@bosup has been working on this PR. Below is for the verification result.
monsoon_Sperber_code_conversion_comparison.pdf

@lee1043 lee1043 linked an issue May 17, 2024 that may be closed by this pull request
Monsoon sperber: add landsea mask estimation if not given #710
Closed
@lee1043 lee1043 modified the milestones: 3.4, 3.5 Jun 1, 2024
@lee1043 lee1043 assigned lee1043 and unassigned lee1043 Jun 1, 2024
@lee1043 lee1043 requested a review from acordonez June 4, 2024 00:07
@lee1043
Copy link
Contributor Author

lee1043 commented Jun 4, 2024

@acordonez I think this PR is pretty much ready. When you get a chance could you please run demo 2b with this PR to see if it runs well?

@acordonez
Copy link
Collaborator

@lee1043 The notebook ran with no errors. I am seeing some slight differences in the metrics but is that also expected similar to the MJO? For example, decay index of 48 vs. 47, or slope of 0.03490883309967567 vs. 0.03399930924787022.

@lee1043
Copy link
Contributor Author

lee1043 commented Jun 11, 2024

@acordonez thanks for reviewing and approving. Yes, although it would be nicer if we've got more consistency for the indices, it looks like further in depth investigation might be needed to fully address that, and I consider for now it is acceptable. I am going to merge this PR and tag v3.5.

@lee1043
Copy link
Contributor Author

lee1043 commented Jun 22, 2024

All checks passed, merging it now.

@lee1043 lee1043 merged commit c3f0846 into main Jun 22, 2024
8 checks passed
@lee1043 lee1043 deleted the new_monsoon_lee1043_clean_up branch June 22, 2024 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@acordonez acordonez acordonez approved these changes

Assignees

@lee1043 lee1043

@bosup bosup

Labels
enhancement
Projects
None yet
Milestone
3.5
Development

Successfully merging this pull request may close these issues.

Implement xCDAT for PMP's Monsoon Sperber Metrics Monsoon sperber: add landsea mask estimation if not given
3 participants
@lee1043 @bosup @acordonez