Skip to content
Snippets Groups Projects
Commit c65e70c4 authored by RODIER Quentin's avatar RODIER Quentin
Browse files

Quentin 26/03/2021: adapt TIME and DATE type and public mode of mode_therm

parent 22f1749b
No related branches found
No related tags found
No related merge requests found
...@@ -135,7 +135,7 @@ DO JCOL = KSTART,KEND ...@@ -135,7 +135,7 @@ DO JCOL = KSTART,KEND
ENDDO ENDDO
! Computation of solar hour angle from sunposn ! Computation of solar hour angle from sunposn
ZTIME = TDTRAD_FULL%TIME + 0.5*XDTRAD ZTIME = TDTRAD_FULL%XTIME + 0.5*XDTRAD
ZUT = MOD( 24.0+MOD(ZTIME/3600.,24.0),24.0 ) ZUT = MOD( 24.0+MOD(ZTIME/3600.,24.0),24.0 )
ZTUT = ZUT - XTSIDER ZTUT = ZUT - XTSIDER
ZSOLANG = (ZTUT-12.0)*15.0*(RPI/180.) ! hour angle in radians ZSOLANG = (ZTUT-12.0)*15.0*(RPI/180.) ! hour angle in radians
......
...@@ -79,7 +79,7 @@ USE YOMHOOK , ONLY : LHOOK, DR_HOOK ...@@ -79,7 +79,7 @@ USE YOMHOOK , ONLY : LHOOK, DR_HOOK
USE MODD_PARAM_ECRAD_n, ONLY : NAERMACC, NDECOLAT, XCLOUD_FRAC_STD, & ! replace YRERAD to get attributes USE MODD_PARAM_ECRAD_n, ONLY : NAERMACC, NDECOLAT, XCLOUD_FRAC_STD, & ! replace YRERAD to get attributes
& LAPPROXLWUPDATE, LAPPROXSWUPDATE & LAPPROXLWUPDATE, LAPPROXSWUPDATE
USE MODD_RADIATIONS_n , ONLY : NSWB_MNH,NSWB_OLD USE MODD_RADIATIONS_n , ONLY : NSWB_MNH,NSWB_OLD
USE MODE_THERMO ! , ONLY QSATW_2D USE MODE_THERMO , ONLY : QSAT
USE MODD_DYN_n , ONLY : XTSTEP, NSTOP USE MODD_DYN_n , ONLY : XTSTEP, NSTOP
USE MODD_TIME , ONLY : TDTEXP USE MODD_TIME , ONLY : TDTEXP
USE MODD_TIME_n , ONLY : TDTMOD,TDTCUR USE MODD_TIME_n , ONLY : TDTMOD,TDTCUR
...@@ -336,7 +336,7 @@ thermodynamics%temperature_hl(KIDIA:KFDIA,KLEV+1) & ...@@ -336,7 +336,7 @@ thermodynamics%temperature_hl(KIDIA:KFDIA,KLEV+1) &
! & PPRESSURE, PTEMPERATURE, thermodynamics%h2o_sat_liq, 2) ! & PPRESSURE, PTEMPERATURE, thermodynamics%h2o_sat_liq, 2)
!MNH !MNH
thermodynamics%h2o_sat_liq(:,:) = QSATW_2D(REAL(PPRESSURE), REAL(PTEMPERATURE)) thermodynamics%h2o_sat_liq(:,:) = QSAT(REAL(PPRESSURE), REAL(PTEMPERATURE))
thermodynamics%h2o_sat_liq(:,:) = thermodynamics%h2o_sat_liq(:,:) & thermodynamics%h2o_sat_liq(:,:) = thermodynamics%h2o_sat_liq(:,:) &
& / (1.+thermodynamics%h2o_sat_liq(:,:)) ! mixing ratio => spec humid & / (1.+thermodynamics%h2o_sat_liq(:,:)) ! mixing ratio => spec humid
!MNH !MNH
...@@ -361,8 +361,8 @@ single_level%lw_emissivity(KIDIA:KFDIA,2) = PEMIS_WINDOW(KIDIA:KFDIA) ...@@ -361,8 +361,8 @@ single_level%lw_emissivity(KIDIA:KFDIA,2) = PEMIS_WINDOW(KIDIA:KFDIA)
! Create the relevant seed from date and time get the starting day ! Create the relevant seed from date and time get the starting day
! and number of minutes since start ! and number of minutes since start
! IDAY = NDD(NINDAT) ! NINDAT is AAAAMMDD initial date NDD extract DD as INTEGER ! IDAY = NDD(NINDAT) ! NINDAT is AAAAMMDD initial date NDD extract DD as INTEGER
IDAY = TDTEXP%TDATE%DAY ! MNH IDAY = TDTEXP%DATE%NDAY ! MNH
ITIM = NINT((TDTMOD%time-TDTCUR%time) / 60.0_JPRB) ! YRRIP contains timestep infos ; number of minutes since beginning ITIM = NINT((TDTMOD%xtime-TDTCUR%xtime) / 60.0_JPRB) ! YRRIP contains timestep infos ; number of minutes since beginning
DO JLON = KIDIA, KFDIA DO JLON = KIDIA, KFDIA
! This method gives a unique value for roughly every 1-km square ! This method gives a unique value for roughly every 1-km square
! on the globe and every minute. ASIN(PGEMU)*60 gives rough ! on the globe and every minute. ASIN(PGEMU)*60 gives rough
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment