Skip to content

Commit

Permalink
Merge pull request #408 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history 
Sync dev into main
  • Loading branch information
@sdrabenh
sdrabenh authored Feb 12, 2021
2 parents fb293fc + 0e7ac3e commit deca210
Show file tree
Hide file tree
Showing 92 changed files with 131 additions and 51 deletions.
1 change: 1 addition & 0 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ else ()

endif()

esma_add_subdirectories(Utils)


44 changes: 37 additions & 7 deletions ...ridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlake_GridComp/GEOS_LakeGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ module GEOS_LakeGridCompMod
integer, parameter :: WATER = 2
integer, parameter :: NUM_SUBTILES = 2

type lake_state
integer:: CHOOSEMOSFC
end type lake_state

type lake_state_wrap
type(lake_state), pointer :: ptr
end type

! !PUBLIC MEMBER FUNCTIONS:

public SetServices
Expand Down Expand Up @@ -69,8 +77,15 @@ subroutine SetServices ( GC, RC )
integer :: STATUS
character(len=ESMF_MAXSTR) :: COMP_NAME

type(lake_state_wrap) :: wrap
type(lake_state), pointer :: mystate
character(len=ESMF_MAXSTR) :: SURFRC
type(ESMF_Config) :: SCF
type (MAPL_MetaComp), pointer :: MAPL
type(ESMF_Config) :: CF

!=============================================================================
!_VERIFY(status)

! Begin...

Expand Down Expand Up @@ -831,6 +846,22 @@ subroutine SetServices ( GC, RC )

!EOS

call MAPL_GetObjectFromGC ( GC, MAPL, RC=STATUS)
VERIFY_(STATUS)

call MAPL_Get(MAPL,cf=cf,RC=STATUS )
VERIFY_(STATUS)

allocate(mystate,stat=status)
VERIFY_(status)
call MAPL_GetResource (MAPL, SURFRC, label = 'SURFRC:', default = 'GEOS_SurfaceGridComp.rc', RC=STATUS) ; VERIFY_(STATUS)
SCF = ESMF_ConfigCreate(rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigLoadFile (SCF,SURFRC,rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigGetAttribute (SCF, label='CHOOSEMOSFC:', value=mystate%CHOOSEMOSFC, DEFAULT=1, __RC__ )
call ESMF_ConfigDestroy (SCF, __RC__)
wrap%ptr => mystate
call ESMF_UserCompSetInternalState(gc, 'lake_private', wrap,status)
VERIFY_(status)

! Set the Profiling timers
! ------------------------
Expand Down Expand Up @@ -983,8 +1014,8 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )

integer :: CHOOSEMOSFC
integer :: CHOOSEZ0
character(len=ESMF_MAXSTR) :: SURFRC
type(ESMF_Config) :: SCF
type(lake_state_wrap) :: wrap
type(lake_state), pointer :: mystate

!=============================================================================

Expand Down Expand Up @@ -1019,11 +1050,10 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )

! Get parameters (0:Louis, 1:Monin-Obukhov)
! -----------------------------------------
call MAPL_GetResource (MAPL, SURFRC, label = 'SURFRC:', default = 'GEOS_SurfaceGridComp.rc', RC=STATUS) ; VERIFY_(STATUS)
SCF = ESMF_ConfigCreate(rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigLoadFile (SCF,SURFRC,rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigGetAttribute (SCF, label='CHOOSEMOSFC:', value=CHOOSEMOSFC, DEFAULT=1, __RC__ )
call ESMF_ConfigDestroy (SCF, __RC__)
call ESMF_UserCompGetInternalState(gc,'lake_private',wrap,status)
VERIFY_(status)
mystate => wrap%ptr
CHOOSEMOSFC = mystate%CHOOSEMOSFC

call MAPL_GetResource ( MAPL, CHOOSEZ0, Label="CHOOSEZ0:", DEFAULT=3, RC=STATUS)
VERIFY_(STATUS)
Expand Down
6 changes: 0 additions & 6 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,3 @@ esma_add_library (${this}
DEPENDENCIES GEOS_SurfaceShared GEOS_LandShared MAPL
INCLUDES ${INC_ESMF})

# Special case for GEOScatch and GEOScatchCN components - build with / without openmp
if (USE_OPENMP)
add_subdirectory (GEOScatch_GridComp GEOScatch_GridComp_openmp)
add_subdirectory (GEOScatchCN_GridComp GEOScatchCN_GridComp_openmp)
endif ()

5 changes: 0 additions & 5 deletions ...ysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
esma_set_this ()
string (REPLACE GEOScatchCN_GridComp_ "" is_openmp ${this})

set (srcs
clmtype.F90
Expand Down Expand Up @@ -47,7 +46,3 @@ esma_add_library (${this}
DEPENDENCIES MAPL GEOS_Shared GEOS_LandShared)
target_include_directories (${this} PUBLIC ${INC_ESMF} ${INC_NETCDF})

if (is_openmp)
target_compile_options(${this} PRIVATE ${OpenMP_Fortran_FLAGS})
endif ()

2 changes: 1 addition & 1 deletion ...Comp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOS_CatchCNGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5138,7 +5138,7 @@ subroutine Driver ( RC )
logical, save :: first = .true.
integer*8, save :: istep = 1 ! gkw: legacy variable from offline

real :: co2
! real :: co2
real, external :: getco2

! temporaries for call to SIBALB for each type
Expand Down
8 changes: 0 additions & 8 deletions ...physics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
esma_set_this ()
string (REPLACE GEOScatch_GridComp_ "" is_openmp ${this})


set (srcs
GEOS_CatchGridComp.F90
Expand All @@ -13,9 +11,3 @@ esma_add_library (${this}
DEPENDENCIES MAPL GEOS_LandShared)
target_include_directories (${this} PUBLIC ${INC_ESMF} ${INC_NETCDF})

add_subdirectory(mk_restarts)

if (is_openmp)
target_compile_options(${this} PRIVATE ${OpenMP_Fortran_FLAGS})
endif ()

36 changes: 29 additions & 7 deletions ...ics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ module GEOS_CICE4ColumnPhysGridComp

logical :: DUAL_OCEAN

type cice_state
integer:: CHOOSEMOSFC
end type cice_state

type cice_state_wrap
type(cice_state), pointer :: ptr
end type

contains

!BOP
Expand Down Expand Up @@ -115,6 +123,11 @@ subroutine SetServices ( GC, RC )
integer :: NUM_ICE_CATEGORIES ! set via resource parameter
integer :: iDUAL_OCEAN

type(cice_state_wrap) :: wrap
type(cice_state), pointer :: mystate
character(len=ESMF_MAXSTR) :: SURFRC
type(ESMF_Config) :: SCF

!=============================================================================

! Begin...
Expand Down Expand Up @@ -1904,6 +1917,16 @@ subroutine SetServices ( GC, RC )

!EOS

allocate(mystate,stat=status)
VERIFY_(status)
call MAPL_GetResource (MAPL, SURFRC, label = 'SURFRC:', default = 'GEOS_SurfaceGridComp.rc', RC=STATUS) ; VERIFY_(STATUS)
SCF = ESMF_ConfigCreate(rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigLoadFile (SCF,SURFRC,rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigGetAttribute (SCF, label='CHOOSEMOSFC:', value=mystate%CHOOSEMOSFC, DEFAULT=1, __RC__ )
call ESMF_ConfigDestroy (SCF, __RC__)
wrap%ptr => mystate
call ESMF_UserCompSetInternalState(gc, 'cice_private', wrap,status)
VERIFY_(status)

! Set the Profiling timers
! ------------------------
Expand Down Expand Up @@ -2294,8 +2317,8 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
integer :: PRES_ICE
integer :: CHOOSEMOSFC
integer :: CHOOSEZ0
character(len=ESMF_MAXSTR) :: SURFRC
type(ESMF_Config) :: SCF
type(cice_state_wrap) :: wrap
type(cice_state), pointer :: mystate

!=============================================================================

Expand Down Expand Up @@ -2340,11 +2363,10 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )

! Get parameters (0:Louis, 1:Monin-Obukhov)
! -----------------------------------------
call MAPL_GetResource (MAPL, SURFRC, label = 'SURFRC:', default = 'GEOS_SurfaceGridComp.rc', RC=STATUS) ; VERIFY_(STATUS)
SCF = ESMF_ConfigCreate(rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigLoadFile (SCF,SURFRC,rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigGetAttribute (SCF, label='CHOOSEMOSFC:', value=CHOOSEMOSFC, DEFAULT=1, __RC__ )
call ESMF_ConfigDestroy (SCF, __RC__)
call ESMF_UserCompGetInternalState(gc,'cice_private',wrap,status)
VERIFY_(status)
mystate => wrap%ptr
CHOOSEMOSFC = mystate%CHOOSEMOSFC

call MAPL_GetResource ( MAPL, CHOOSEZ0, Label="CHOOSEZ0:", DEFAULT=3, RC=STATUS)
VERIFY_(STATUS)
Expand Down
38 changes: 31 additions & 7 deletions ...OSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_OpenWaterGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ module GEOS_OpenwaterGridCompMod
integer, parameter :: NUM_SUBTILES = 1 ! number of sub-tiles
real, parameter :: KUVR = 0.09

type openwater_state
integer:: CHOOSEMOSFC
end type openwater_state

type openwater_state_wrap
type(openwater_state), pointer :: ptr
end type

contains

!BOP
Expand Down Expand Up @@ -132,6 +140,11 @@ subroutine SetServices ( GC, RC )
type (MAPL_MetaComp), pointer :: MAPL
type (ESMF_Config) :: CF

type(openwater_state_wrap) :: wrap
type(openwater_state), pointer :: mystate
character(len=ESMF_MAXSTR) :: SURFRC
type(ESMF_Config) :: SCF

!=============================================================================

! Begin...
Expand Down Expand Up @@ -1436,6 +1449,17 @@ subroutine SetServices ( GC, RC )

!EOS

allocate(mystate,stat=status)
VERIFY_(status)
call MAPL_GetResource (MAPL, SURFRC, label = 'SURFRC:', default = 'GEOS_SurfaceGridComp.rc', RC=STATUS) ; VERIFY_(STATUS)
SCF = ESMF_ConfigCreate(rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigLoadFile (SCF,SURFRC,rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigGetAttribute (SCF, label='CHOOSEMOSFC:', value=mystate%CHOOSEMOSFC, DEFAULT=1, __RC__ )
call ESMF_ConfigDestroy (SCF, __RC__)
wrap%ptr => mystate
call ESMF_UserCompSetInternalState(gc, 'openwater_private', wrap,status)
VERIFY_(status)

! Set the Profiling timers
! ------------------------

Expand Down Expand Up @@ -1611,8 +1635,8 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
real :: MinWaterDepth
real :: OGCM_top_thickness ! thickness of OGCM top layer (D) in AS2018

character(len=ESMF_MAXSTR) :: SURFRC
type(ESMF_Config) :: SCF
type(openwater_state_wrap) :: wrap
type(openwater_state), pointer :: mystate
character(len=100) :: WHICH_T_TO_SFCLAYER ! what temperature does the sfclayer get from AOIL?
real :: DEPTH_T_TO_SFCLAYER ! temperature (at what depth) does the sfclayer get from AOIL?

Expand Down Expand Up @@ -1655,11 +1679,11 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )

! Get parameters (0:Louis, 1:Monin-Obukhov)
! -----------------------------------------
call MAPL_GetResource (MAPL, SURFRC, label = 'SURFRC:', default = 'GEOS_SurfaceGridComp.rc', RC=STATUS) ; VERIFY_(STATUS)
SCF = ESMF_ConfigCreate(rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigLoadFile (SCF,SURFRC,rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigGetAttribute (SCF, label='CHOOSEMOSFC:', value=CHOOSEMOSFC, DEFAULT=1, __RC__ )
call ESMF_ConfigDestroy (SCF, __RC__)
! -----------------------------------------
call ESMF_UserCompGetInternalState(gc,'openwater_private',wrap,status)
VERIFY_(status)
mystate => wrap%ptr
CHOOSEMOSFC = mystate%CHOOSEMOSFC

call MAPL_GetResource ( MAPL, CHOOSEZ0, Label="CHOOSEZ0:", DEFAULT=3, RC=STATUS)
VERIFY_(STATUS)
Expand Down
38 changes: 30 additions & 8 deletions ...hysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SimpleSeaiceGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,15 @@ module GEOS_SimpleSeaiceGridCompMod
!EOP

integer, parameter :: ICE = 1
integer, parameter :: NUM_SUBTILES = 1
integer, parameter :: NUM_SUBTILES = 1

type ssi_state
integer:: CHOOSEMOSFC
end type ssi_state

type ssi_state_wrap
type(ssi_state), pointer :: ptr
end type

contains

Expand Down Expand Up @@ -84,6 +92,11 @@ subroutine SetServices ( GC, RC )
type (MAPL_MetaComp), pointer :: MAPL
type (ESMF_Config) :: CF

type(ssi_state_wrap) :: wrap
type(ssi_state), pointer :: mystate
character(len=ESMF_MAXSTR) :: SURFRC
type(ESMF_Config) :: SCF

!=============================================================================

! Begin...
Expand Down Expand Up @@ -1181,6 +1194,16 @@ subroutine SetServices ( GC, RC )

!EOS

allocate(mystate,stat=status)
VERIFY_(status)
call MAPL_GetResource (MAPL, SURFRC, label = 'SURFRC:', default = 'GEOS_SurfaceGridComp.rc', RC=STATUS) ; VERIFY_(STATUS)
SCF = ESMF_ConfigCreate(rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigLoadFile (SCF,SURFRC,rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigGetAttribute (SCF, label='CHOOSEMOSFC:', value=mystate%CHOOSEMOSFC, DEFAULT=1, __RC__ )
call ESMF_ConfigDestroy (SCF, __RC__)
wrap%ptr => mystate
call ESMF_UserCompSetInternalState(gc, 'ssi_private', wrap,status)
VERIFY_(status)

! Set the Profiling timers
! ------------------------
Expand Down Expand Up @@ -1343,8 +1366,8 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )

integer :: CHOOSEMOSFC
integer :: CHOOSEZ0
character(len=ESMF_MAXSTR) :: SURFRC
type(ESMF_Config) :: SCF
type(ssi_state_wrap) :: wrap
type(ssi_state), pointer :: mystate

!=============================================================================

Expand Down Expand Up @@ -1380,11 +1403,10 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )

! Get parameters (0:Louis, 1:Monin-Obukhov)
! -----------------------------------------
call MAPL_GetResource (MAPL, SURFRC, label = 'SURFRC:', default = 'GEOS_SurfaceGridComp.rc', RC=STATUS) ; VERIFY_(STATUS)
SCF = ESMF_ConfigCreate(rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigLoadFile (SCF,SURFRC,rc=status) ; VERIFY_(STATUS)
call ESMF_ConfigGetAttribute (SCF, label='CHOOSEMOSFC:', value=CHOOSEMOSFC, DEFAULT=1, __RC__ )
call ESMF_ConfigDestroy (SCF, __RC__)
call ESMF_UserCompGetInternalState(gc,'ssi_private',wrap,status)
VERIFY_(status)
mystate => wrap%ptr
CHOOSEMOSFC = mystate%CHOOSEMOSFC

call MAPL_GetResource ( MAPL, CHOOSEZ0, Label="CHOOSEZ0:", DEFAULT=3, RC=STATUS)
VERIFY_(STATUS)
Expand Down
2 changes: 0 additions & 2 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Note that directory and library name do not correspond!
esma_set_this (OVERRIDE GEOS_SurfaceShared)
esma_add_subdirectories (Raster)

set (resource_files
GEOS_SurfaceGridComp.rc
Expand All @@ -15,4 +14,3 @@ set (srcs
SurfParams.F90)

esma_add_library (${this} SRCS ${srcs} DEPENDENCIES GEOS_Shared MAPL)
#target_compile_options (${this} PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${FREAL4}>)
2 changes: 2 additions & 0 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#
esma_add_subdirectories (Raster mk_restarts)
0 ...ace_GridComp/Shared/Raster/CMakeLists.txt → ...face_GridComp/Utils/Raster/CMakeLists.txt
View file
File renamed without changes.
0 ...GridComp/Shared/Raster/CombineRasters.F90 → ..._GridComp/Utils/Raster/CombineRasters.F90
View file
File renamed without changes.
0 ...ace_GridComp/Shared/Raster/ConvertAlb.F90 → ...face_GridComp/Utils/Raster/ConvertAlb.F90
View file
File renamed without changes.
0 ...omp/Shared/Raster/CubedSphere_GridMod.F90 → ...Comp/Utils/Raster/CubedSphere_GridMod.F90
View file
File renamed without changes.
0 ...ce_GridComp/Shared/Raster/FillMomGrid.F90 → ...ace_GridComp/Utils/Raster/FillMomGrid.F90
View file
File renamed without changes.
0 ...red/Raster/PEATCLSM_fitting_CLSM_params.R → ...ils/Raster/PEATCLSM_fitting_CLSM_params.R
View file
File renamed without changes.
0 ...OSsurface_GridComp/Shared/Raster/Raster.h → ...EOSsurface_GridComp/Utils/Raster/Raster.h
View file
File renamed without changes.
0 ...ace_GridComp/Shared/Raster/asia_tiles.pro → ...face_GridComp/Utils/Raster/asia_tiles.pro
View file
File renamed without changes.
0 ...ridComp/Shared/Raster/chk_clsm_params.F90 → ...GridComp/Utils/Raster/chk_clsm_params.F90
View file
File renamed without changes.
0 ...ace_GridComp/Shared/Raster/clsm_plots.pro → ...face_GridComp/Utils/Raster/clsm_plots.pro
View file
File renamed without changes.
0 ...ster/comp_CATCHCN_AlbScale_parameters.F90 → ...ster/comp_CATCHCN_AlbScale_parameters.F90
View file
File renamed without changes.
0 ..._GridComp/Shared/Raster/compile_mk_runoff → ...e_GridComp/Utils/Raster/compile_mk_runoff
View file
File renamed without changes.
0 ..._GridComp/Shared/Raster/create_README.csh → ...e_GridComp/Utils/Raster/create_README.csh
View file
File renamed without changes.
0 ...Comp/Shared/Raster/create_vegdyn_ndvi.F90 → ...dComp/Utils/Raster/create_vegdyn_ndvi.F90
View file
File renamed without changes.
0 ...GridComp/Shared/Raster/date_time_util.F90 → ..._GridComp/Utils/Raster/date_time_util.F90
View file
File renamed without changes.
0 ...ce_GridComp/Shared/Raster/easeV1_conv.F90 → ...ace_GridComp/Utils/Raster/easeV1_conv.F90
View file
File renamed without changes.
0 ...ce_GridComp/Shared/Raster/easeV2_conv.F90 → ...ace_GridComp/Utils/Raster/easeV2_conv.F90
View file
File renamed without changes.
0 ...urface_GridComp/Shared/Raster/findloc.F90 → ...surface_GridComp/Utils/Raster/findloc.F90
View file
File renamed without changes.
0 ...rface_GridComp/Shared/Raster/get_frac.pro → ...urface_GridComp/Utils/Raster/get_frac.pro
View file
File renamed without changes.
0 ...ace_GridComp/Shared/Raster/irrg_model.F90 → ...face_GridComp/Utils/Raster/irrg_model.F90
View file
File renamed without changes.
0 ...face_GridComp/Shared/Raster/leap_year.F90 → ...rface_GridComp/Utils/Raster/leap_year.F90
View file
File renamed without changes.
0 ...ridComp/Shared/Raster/loss_during_day.f90 → ...GridComp/Utils/Raster/loss_during_day.f90
View file
File renamed without changes.
0 ...ace_GridComp/Shared/Raster/loss_perday.sh → ...face_GridComp/Utils/Raster/loss_perday.sh
View file
File renamed without changes.
0 ...ce_GridComp/Shared/Raster/loss_perhour.sh → ...ace_GridComp/Utils/Raster/loss_perhour.sh
View file
File renamed without changes.
0 ...p/Shared/Raster/loss_surf_5cm_gensoil.f90 → ...mp/Utils/Raster/loss_surf_5cm_gensoil.f90
View file
File renamed without changes.
0 .../Shared/Raster/m_loss_during_routines.f90 → ...p/Utils/Raster/m_loss_during_routines.f90
View file
File renamed without changes.
0 ...OSsurface_GridComp/Shared/Raster/make_bcs → ...EOSsurface_GridComp/Utils/Raster/make_bcs
View file
File renamed without changes.
0 ...surface_GridComp/Shared/Raster/make_tiles → ...Ssurface_GridComp/Utils/Raster/make_tiles
View file
File renamed without changes.
0 ...e_GridComp/Shared/Raster/mkCatchParam.F90 → ...ce_GridComp/Utils/Raster/mkCatchParam.F90
View file
File renamed without changes.
0 ...GridComp/Shared/Raster/mkCubeFVRaster.F90 → ..._GridComp/Utils/Raster/mkCubeFVRaster.F90
View file
File renamed without changes.
0 ...GridComp/Shared/Raster/mkLISTilesPara.F90 → ..._GridComp/Utils/Raster/mkLISTilesPara.F90
View file
File renamed without changes.
0 ...e_GridComp/Shared/Raster/mkLandRaster.F90 → ...ce_GridComp/Utils/Raster/mkLandRaster.F90
View file
File renamed without changes.
0 ...GridComp/Shared/Raster/mkLatLonRaster.F90 → ..._GridComp/Utils/Raster/mkLatLonRaster.F90
View file
File renamed without changes.
0 ...ridComp/Shared/Raster/mkMITAquaRaster.F90 → ...GridComp/Utils/Raster/mkMITAquaRaster.F90
View file
File renamed without changes.
0 ...ridComp/Shared/Raster/mkMOMAquaRaster.F90 → ...GridComp/Utils/Raster/mkMOMAquaRaster.F90
View file
File renamed without changes.
0 ...ridComp/Shared/Raster/mkSMAPTilesPara.F90 → ...GridComp/Utils/Raster/mkSMAPTilesPara.F90
View file
File renamed without changes.
0 ...Comp/Shared/Raster/mkSMAPTilesPara_v2.F90 → ...dComp/Utils/Raster/mkSMAPTilesPara_v2.F90
View file
File renamed without changes.
0 ...e_GridComp/Shared/Raster/mk_runofftbl.F90 → ...ce_GridComp/Utils/Raster/mk_runofftbl.F90
View file
File renamed without changes.
0 ...p/Shared/Raster/mod_process_hres_data.F90 → ...mp/Utils/Raster/mod_process_hres_data.F90
View file
File renamed without changes.
0 ...Comp/Shared/Raster/modis_scale_factor.pro → ...dComp/Utils/Raster/modis_scale_factor.pro
View file
File renamed without changes.
0 ...Shared/Raster/mosaic_classes_on_tiles.pro → .../Utils/Raster/mosaic_classes_on_tiles.pro
View file
File renamed without changes.
0 ...ce_GridComp/Shared/Raster/plot_curves.csh → ...ace_GridComp/Utils/Raster/plot_curves.csh
View file
File renamed without changes.
0 ...ce_GridComp/Shared/Raster/plot_curves.pro → ...ace_GridComp/Utils/Raster/plot_curves.pro
View file
File renamed without changes.
0 ...ridComp/Shared/Raster/plot_geos5_grid.pro → ...GridComp/Utils/Raster/plot_geos5_grid.pro
View file
File renamed without changes.
0 ...face_GridComp/Shared/Raster/rasterize.F90 → ...rface_GridComp/Utils/Raster/rasterize.F90
View file
File renamed without changes.
0 ...urface_GridComp/Shared/Raster/rasterize.H → ...surface_GridComp/Utils/Raster/rasterize.H
View file
File renamed without changes.
0 ...idComp/Shared/Raster/read_riveroutlet.F90 → ...ridComp/Utils/Raster/read_riveroutlet.F90
View file
File renamed without changes.
0 ...Comp/Shared/Raster/rmTinyCatchParaMod.F90 → ...dComp/Utils/Raster/rmTinyCatchParaMod.F90
View file
File renamed without changes.
0 ...ce_GridComp/Shared/Raster/rmTinyTiles.F90 → ...ace_GridComp/Utils/Raster/rmTinyTiles.F90
View file
File renamed without changes.
0 ...OSsurface_GridComp/Shared/Raster/sibalb.f → ...EOSsurface_GridComp/Utils/Raster/sibalb.f
View file
File renamed without changes.
0 ...omp/Shared/Raster/soil_types_on_tiles.pro → ...Comp/Utils/Raster/soil_types_on_tiles.pro
View file
File renamed without changes.
0 ...GEOSsurface_GridComp/Shared/Raster/util.c → .../GEOSsurface_GridComp/Utils/Raster/util.c
View file
File renamed without changes.
0 ...OSsurface_GridComp/Shared/Raster/zenith.f → ...EOSsurface_GridComp/Utils/Raster/zenith.f
View file
File renamed without changes.
0 .../GEOSsurface_GridComp/Shared/Raster/zip.c → ...p/GEOSsurface_GridComp/Utils/Raster/zip.c
View file
File renamed without changes.
0 ...GEOScatch_GridComp/mk_restarts/.gitignore → ...ace_GridComp/Utils/mk_restarts/.gitignore
View file
File renamed without changes.
0 ...catch_GridComp/mk_restarts/CMakeLists.txt → ...GridComp/Utils/mk_restarts/CMakeLists.txt
View file
File renamed without changes.
0 ...omp/GEOScatch_GridComp/mk_restarts/README → ...surface_GridComp/Utils/mk_restarts/README
View file
File renamed without changes.
0 ...GridComp/mk_restarts/SaltImpConverter.F90 → ...mp/Utils/mk_restarts/SaltImpConverter.F90
View file
File renamed without changes.
0 ..._GridComp/mk_restarts/SaltIntSplitter.F90 → ...omp/Utils/mk_restarts/SaltIntSplitter.F90
View file
File renamed without changes.
0 ...atch_GridComp/mk_restarts/Scale_Catch.F90 → ...ridComp/Utils/mk_restarts/Scale_Catch.F90
View file
File renamed without changes.
0 ...ch_GridComp/mk_restarts/Scale_CatchCN.F90 → ...dComp/Utils/mk_restarts/Scale_CatchCN.F90
View file
File renamed without changes.
0 ...p/GEOScatch_GridComp/mk_restarts/catchplt → ...rface_GridComp/Utils/mk_restarts/catchplt
View file
File renamed without changes.
0 ...dComp/mk_restarts/check_land_restarts.pro → ...Utils/mk_restarts/check_land_restarts.pro
View file
File renamed without changes.
0 ...h_GridComp/mk_restarts/cv_SaltRestart.F90 → ...Comp/Utils/mk_restarts/cv_SaltRestart.F90
View file
File renamed without changes.
0 ...GEOScatch_GridComp/mk_restarts/getids.F90 → ...ace_GridComp/Utils/mk_restarts/getids.F90
View file
File renamed without changes.
0 ...h_GridComp/mk_restarts/mk_CICERestart.F90 → ...Comp/Utils/mk_restarts/mk_CICERestart.F90
View file
File renamed without changes.
0 ...idComp/mk_restarts/mk_CatchCNRestarts.F90 → .../Utils/mk_restarts/mk_CatchCNRestarts.F90
View file
File renamed without changes.
0 ...GridComp/mk_restarts/mk_CatchRestarts.F90 → ...mp/Utils/mk_restarts/mk_CatchRestarts.F90
View file
File renamed without changes.
0 ...k_restarts/mk_LakeLandiceSaltRestarts.F90 → ...k_restarts/mk_LakeLandiceSaltRestarts.F90
View file
File renamed without changes.
0 ...EOScatch_GridComp/mk_restarts/mk_Restarts → ...ce_GridComp/Utils/mk_restarts/mk_Restarts
View file
File renamed without changes.
0 ...GridComp/mk_restarts/mk_RouteRestarts.F90 → ...mp/Utils/mk_restarts/mk_RouteRestarts.F90
View file
File renamed without changes.
0 ...tch_GridComp/mk_restarts/mk_catch_restart → ...idComp/Utils/mk_restarts/mk_catch_restart
View file
File renamed without changes.
0 ...GridComp/mk_restarts/mk_catch_restart.F90 → ...mp/Utils/mk_restarts/mk_catch_restart.F90
View file
File renamed without changes.
0 ...ch_GridComp/mk_restarts/mk_vegdyn_restart → ...dComp/Utils/mk_restarts/mk_vegdyn_restart
View file
File renamed without changes.
0 ...ridComp/mk_restarts/mk_vegdyn_restart.F90 → ...p/Utils/mk_restarts/mk_vegdyn_restart.F90
View file
File renamed without changes.
0 ...Scatch_GridComp/mk_restarts/new_catch.ctl → ..._GridComp/Utils/mk_restarts/new_catch.ctl
View file
File renamed without changes.
0 ...OScatch_GridComp/mk_restarts/newcatch.F90 → ...e_GridComp/Utils/mk_restarts/newcatch.F90
View file
File renamed without changes.
0 ...Scatch_GridComp/mk_restarts/newvegdyn.f90 → ..._GridComp/Utils/mk_restarts/newvegdyn.f90
View file
File renamed without changes.
0 ...Scatch_GridComp/mk_restarts/old_catch.ctl → ..._GridComp/Utils/mk_restarts/old_catch.ctl
View file
File renamed without changes.
0 ...h_GridComp/mk_restarts/replace_params.F90 → ...Comp/Utils/mk_restarts/replace_params.F90
View file
File renamed without changes.
0 ...tch_GridComp/mk_restarts/strip_vegdyn.F90 → ...idComp/Utils/mk_restarts/strip_vegdyn.F90
View file
File renamed without changes.

0 comments on commit deca210

Please sign in to comment.