Skip to content

Commit

Permalink
Merge pull request #928 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathomp4
mathomp4 authored May 6, 2024
2 parents c13beff + db55c30 commit 4e81771
Show file tree
Hide file tree
Showing 9 changed files with 156 additions and 78 deletions.
9 changes: 9 additions & 0 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_BACM_1M_InterfaceMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,15 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
endif
endif

call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = RAD_QR*RAD_CF

call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = RAD_QS*RAD_CF

call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = RAD_QG*RAD_CF

call MAPL_TimerOff (MAPL,"--BACM_1M")

end subroutine BACM_1M_Run
Expand Down
9 changes: 9 additions & 0 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_GFDL_1M_InterfaceMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,15 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)

endif

call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QRAIN

call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QSNOW

call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QGRAUPEL

call MAPL_TimerOff(MAPL,"--GFDL_1M",RC=STATUS)

end subroutine GFDL_1M_Run
Expand Down
9 changes: 9 additions & 0 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MGB2_2M_InterfaceMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2494,6 +2494,15 @@ subroutine MGB2_2M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
endif
endif

call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QRAIN

call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QSNOW

call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QGRAUPEL

call MAPL_TimerOff(MAPL,"--MGB2_2M",__RC__)

end subroutine MGB2_2M_Run
Expand Down
142 changes: 83 additions & 59 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
View file

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_THOM_1M_InterfaceMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,15 @@ subroutine THOM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)

endif

call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QRAIN

call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QSNOW

call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QGRAUPEL

call MAPL_TimerOff(MAPL,"--THOM_1M",RC=STATUS)

end subroutine THOM_1M_Run
Expand Down
28 changes: 23 additions & 5 deletions ..._GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_ease.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,35 @@
def make_bcs_ease(config):
bin_dir = os.getcwd()
if '/bin' not in bin_dir:
print("please run this program in installed bin directory")
return
print(" ")
print("******************************************************************")
print("ERROR: Must run this program in installed bin directory. ")
print("******************************************************************")
return

grid_type = config['grid_type']
resolution = config['resolution']
GRIDNAME = grid_type+'_'+ resolution

if 'EASEv' not in grid_type :
print('This is not a EASE grid')
print(" ")
print("******************************************************************")
print("ERROR: " + GRIDNAME + " is not an EASE grid. ")
print("******************************************************************")
return

resolution = config['resolution']
# if resolution is M01 in EASEv1 or EASEv2, do not execute
# Instead, exist and print an on-screen message to the user
if resolution == "M01":
print(" ")
print("******************************************************************")
print("WARNING: Job for " + GRIDNAME + " not submitted! ")
print(" EASEv[x]_M01 (~1 km) resolution requires custom process. ")
print(" Contact GMAO Land Group for assistance. ")
print("******************************************************************")
print(" ")
return

GRIDNAME = grid_type+'_'+ resolution
now = datetime.now()
tmp_dir = now.strftime("%Y%m%d%H%M%S")
tmp_dir = f"{resolution}_{tmp_dir}"
Expand Down
4 changes: 2 additions & 2 deletions ...mp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_questionary.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def ask_questions(default_grid="Cubed-Sphere"):
"name": "EASEv1",
"message": "Select EASEv1 grid resolution: \n ",
"choices": [ \
#"M01 -- 1km $34668x14688$", \
"M01 -- 1km $34668x14688$", \
"M03 -- 3km $11556x4896$", \
"M09 -- 9km $3852x1632$", \
"M25 -- 25km $1383x586$", \
Expand All @@ -292,7 +292,7 @@ def ask_questions(default_grid="Cubed-Sphere"):
"name": "EASEv2",
"message": "Select EASEv2 grid resolution: \n ",
"choices": [ \
#"M01 -- 1km $34704x14616$", \
"M01 -- 1km $34704x14616$", \
"M03 -- 3km $11568x4872$", \
"M09 -- 9km $3856x1624$", \
"M25 -- 25km $1388x584$", \
Expand Down
4 changes: 2 additions & 2 deletions GEOSogcm_GridComp/GEOSseaice_GridComp/CICE_GEOSPlug/cice6_app/1440x1080/ice_in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
lonpnt(1) = 0.
latpnt(2) = -65.
lonpnt(2) = -45.
histfreq = 'm','d','x','x','x'
histfreq = 'm','x','x','x','x'
histfreq_n = 1 , 1 , 1 , 1 , 1
histfreq_base = 'zero'
hist_avg = .true.
Expand Down Expand Up @@ -240,7 +240,7 @@
iceruf_ocn = 0.03
emissivity = 0.985
fbot_xfer_type = 'constant'
update_ocn_f = .false.
update_ocn_f = .true.
l_mpond_fresh = .false.
tfrz_option = 'linear_salt'
oceanmixed_ice = .false.
Expand Down
20 changes: 10 additions & 10 deletions GEOSogcm_GridComp/GEOSseaice_GridComp/CICE_GEOSPlug/cice6_app/540x458/ice_in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
lonpnt(1) = 0.
latpnt(2) = -65.
lonpnt(2) = -45.
histfreq = 'm','d','x','x','x'
histfreq = 'm','x','x','x','x'
histfreq_n = 1 , 1 , 1 , 1 , 1
histfreq_base = 'zero'
hist_avg = .true.
Expand Down Expand Up @@ -101,8 +101,8 @@
restart_lvl = .true.
tr_pond_topo = .false.
restart_pond_topo = .false.
tr_pond_lvl = .false.
restart_pond_lvl = .false.
tr_pond_lvl = .true.
restart_pond_lvl = .true.
tr_snow = .false.
restart_snow = .false.
tr_iso = .false.
Expand All @@ -115,7 +115,7 @@

&thermo_nml
kitd = 1
ktherm = 1
ktherm = 2
conduct = 'bubbly'
ksno = 0.3d0
a_rapid_mode = 0.5e-3
Expand Down Expand Up @@ -174,19 +174,19 @@
/

&shortwave_nml
shortwave = 'ccsm3'
shortwave = 'dEdd'
albedo_type = 'ccsm3'
albicev = 0.78
albicei = 0.36
albsnowv = 0.98
albsnowi = 0.70
ahmax = 0.3
R_ice = 0.
R_pnd = 0.
R_snw = 1.5
R_ice = -1.
R_pnd = -1.
R_snw = -1.
dT_mlt = 1.5
rsnw_mlt = 1500.
kalg = 0.6
kalg = 0.0
sw_redist = .true.
sw_frac = 0.9d0
sw_dtemp = 0.02d0
Expand Down Expand Up @@ -240,7 +240,7 @@
iceruf_ocn = 0.03
emissivity = 0.985
fbot_xfer_type = 'constant'
update_ocn_f = .false.
update_ocn_f = .true.
l_mpond_fresh = .false.
tfrz_option = 'linear_salt'
oceanmixed_ice = .false.
Expand Down

0 comments on commit 4e81771

Please sign in to comment.