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.

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

Develop #292

Merged
merged 3 commits into from
Aug 12, 2020
Merged

Develop #292

merged 3 commits into from
Aug 12, 2020

Commits on Aug 5, 2020

  1. Configuration menu
    Copy the full SHA
    ea944e8 View commit details
    Browse the repository at this point in the history
  2. Clean-up and re-organization of subroutines and functions needed for …

    …GEOSldas pre-processing (#283)
    
    - Improved documentation of bug in some EASE *.til files (header says N_grid=1 but has lines for two grid defs in header)
    
    - Introduced tile type MAPL_Land_ExcludeFromDomain
    
    - Added consistency checks in createLocalTilefile()
    
    - Collected subroutines and functions needed only in pre-processing into single file preprocess_ldas_routines.F90.  Executed in three consecutive git commits:
    
    Commit 1 of 3:
    - renamed:  src/Applications/LDAS_App/preprocess_ldas.F90 -> src/Applications/LDAS_App/preprocess_ldas_routines.F90
    - deleted:    src/Applications/LDAS_App/preprocess_ldas_subs.F90
    - deleted:    src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_init_routines.F90
    
    Commit 2 of 3: 
    - collected subroutines and functions that are only needed in preprocessing into a single new file: preprocess_ldas_routines.F90, including
      - all subroutines from preprocess_ldas.F90
      - LDAS_read_til_file()                         [from LDAS_TileCoordRoutines.F90]
          - read_grid_elev()                            [helper subroutine]
          - fix_dateline_bug_in_tilecoord()     [helper subroutine]
          - read_catchment_def()                   [helper subroutine]
      - domain_setup()                            [from LDAS_ensdrv_init_routines.F90]
          - read_exclude_or_includelist()       [helper subroutine]
          - read_cat_param()                          [helper subroutine]
    - moved subroutine io_domain_files() from LDAS_ensdrv_init_routines.F90 to LDAS_TileCoordRoutines.F90
    - deleted LDAS_ensdrv_init_routines.F90
    
    Commit 3 of 3: 
    - added preprocess_ldas.F90 (main program only) back into git
    
    Moved additional subroutines and functions that are only used in LDAS pre-processing to preprocess_ldas_routines.F90:
    - is_cat_in_box()                      [from LDAS_TileCoordRoutines.F90]
    - is_in_list()                              [from LDAS_ensdrv_functions.F90]
    - is_in_domain()                      [from LDAS_ensdrv_functions.F90]
    - word_count()                        [from LDAS_ensdrv_functions.F90]
    - open_land_param_file()        [from LDAS_ensdrv_functions.F90]
    
    Commented out obsolete subroutines and functions:
    - io_mwRTM_param_type()    [in  mwRTM_types.F90]
    - mwRTM_get_param()          [in  mwRTM_routines.F90]
    - int2char2()                           [in  LDAS_ensdrv_function.F90]
    - int2char4()                           [in  LDAS_ensdrv_function.F90]
    - timetag()                             [in  LDAS_ensdrv_function.F90]
    - mydate()                             [in  LDAS_ensdrv_function.F90]
    weiyuan-jiang committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    05d1a81 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. Configuration menu
    Copy the full SHA
    b68dc32 View commit details
    Browse the repository at this point in the history