Changeset 995

Timestamp:

12/30/19 12:37:59 (4 years ago)

Author:

jisesh

Message:

devel: Added Teq and h0 as arguments

Location:

codes/icosagcm/devel/src

Files:

• dcmip/dcmip_initial_conditions_test_1_2_3_v5.f90 (modified) (9 diffs)
• initial/etat0_dcmip2.f90 (modified) (3 diffs)

codes/icosagcm/devel/src/dcmip/dcmip_initial_conditions_test_1_2_3_v5.f90

@@ -874 +874 @@
 ! Test 2-0:  Steady-State Atmosphere at Rest in the Presence of Orography
 !=========================================================================
-SUBROUTINE test2_steady_state_mountain (lon,lat,p,z,zcoords,hybrid_eta,hyam,hybm,u,v,w,t,phis,ps,rho,q)
+SUBROUTINE test2_steady_state_mountain (lon,lat,p,z,zcoords,hybrid_eta,hyam,hybm,u,v,w,t,phis,ps,rho,q,h0_test2)
 
 IMPLICIT NONE
@@ -922 +922 @@
                                 lambdam = 3.d0*pi/2.d0,         &       ! mountain longitude center point (radians)   
                                 phim    = 0.d0,                 &       ! mountain latitude center point (radians)    
-                                h0      = 2000.d0,              &       ! peak height of the mountain range (m)
                                 Rm      = 3.d0*pi/4.d0,         &       ! mountain radius (radians)
                                 zetam   = pi/16.d0,             &       ! mountain oscillation half-width (radians) 
@@ -930 +929 @@
       real(rstd) :: r                                                   ! Great circle distance (radians)
       real(rstd) :: zs                                                  ! Surface elevation (m)
-      real(rstd) :: exponent                                               ! exponent: g/(Rd * gamma)
-      real(rstd) :: exponent_rev                                           ! reversed exponent
-
+      real(rstd) :: exponent                                            ! exponent: g/(Rd * gamma)
+      real(rstd) :: exponent_rev                                        ! reversed exponent
+      real(rstd) :: h0                                                  ! peak height of the mountain range (m)
+      real(rstd), optional :: h0_test2
+
+      if (present(h0_test2)) then 
+         h0 = h0_test2       ! peak height of the mountain range (m), can be modified in run.def 
+      else
+         h0 = 250.d0         ! Default value for call without optional variable h0_test2
+      endif
 
 !-----------------------------------------------------------------------
@@ -1025 +1031 @@
 !=====================================================================================
 
-SUBROUTINE test2_schaer_mountain (lon,lat,p,z,zcoords,hybrid_eta,hyam,hybm,shear,u,v,w,t,phis,ps,rho,q)
-USE getin_mod, ONLY : getin
+SUBROUTINE test2_schaer_mountain (lon,lat,p,z,zcoords,hybrid_eta,hyam,hybm,shear,u,v,w,t,phis,ps,rho,q,h0_test2,Teq_test2)
+
 IMPLICIT NONE
 !-----------------------------------------------------------------------
@@ -1078 +1084 @@
                                 lambdac = pi/4.d0,              &       ! Lon of Schar Mountain Center
                                 phic    = 0.d0,                 &       ! Lat of Schar Mountain Center
-                                h0      = 250.d0,               &       ! Height of Mountain
                                 d       = 5000.d0,              &       ! Mountain Half-Width
                                 xi      = 4000.d0,              &       ! Mountain Wavelength
@@ -1088 +1093 @@
       real(rstd) :: zs                                                  ! Surface height
       real(rstd) :: c                                                   ! Shear
-
-      REAL(rstd) :: Teq                 = 300.d0   ! default Temperature at Equator, can be modified in run.def
-
-      CALL getin("dcmip2_Teq",Teq)
+      real(rstd) :: h0                                                  ! peak height of the mountain range (m)
+      real(rstd) :: Teq                                                 ! Temperature at Equator    
+      real(rstd), optional :: h0_test2,Teq_test2 ! FIX default value in MODULE etat0_dcmip2_mod
+
+      if (present(h0_test2)) then
+         h0 = h0_test2           ! peak height of the mountain range (m), can be modified in run.def
+      else
+         h0 = 250.d0             ! Default value for call without optional variable h0_test2
+      endif
+      if (present(Teq_test2)) then
+         Teq = Teq_test2         ! Temperature at Equator, can be modified in run.def
+      else
+         Teq = 300.d0            ! Default value for call without optional variable Teq_test2
+      endif
 !-----------------------------------------------------------------------
 !    PHIS (surface geopotential)
@@ -1199 +1214 @@
 !==========
 SUBROUTINE test3_gravity_wave (X,lon,lat,p,z,zcoords,u,v,w,t,phis,ps,rho,q)
-USE getin_mod, ONLY : getin
+
 IMPLICIT NONE
 !-----------------------------------------------------------------------
@@ -1234 +1249 @@
                                 u0      = 20.d0,                &       ! Reference Velocity 
 !                               u0      = 0.d0,                 &       ! FIXME : no zonal wind for NH tests
+                                Teq     = 300.d0,               &       ! Temperature at Equator    
                                 Peq     = 100000.d0,            &       ! Reference PS at Equator
                                 ztop    = 10000.d0,             &       ! Model Top       
@@ -1254 +1270 @@
       real(rstd) :: theta_pert                                          ! Pot-temp perturbation
 
-      REAL(rstd) :: Teq                 = 300.d0   ! default Temperature at Equator, can be modified in run.def
-
-      CALL getin("dcmip2_Teq",Teq)
-
       as = a/X
 

codes/icosagcm/devel/src/initial/etat0_dcmip2.f90

@@ -7 +7 @@
   INTEGER, SAVE :: testcase
   INTEGER, PARAMETER :: mountain=0, schaer_noshear=1, schaer_shear=2
+  REAL(rstd):: Teq_test2= 300.d0,h0_test2 = 250.d0
 
-  PUBLIC getin_etat0, compute_etat0
+  PUBLIC getin_etat0, compute_etat0,Teq_test2,h0_test2
 
 CONTAINS
@@ -16 +17 @@
     etat0_type='jablonowsky06'
     CALL getin("etat0",etat0_type)
+    CALL getin("dcmip2_Teq",Teq_test2)
+    CALL getin("dcmip2_h0",h0_test2)
     SELECT CASE (TRIM(etat0_type))
     CASE('dcmip2_mountain')
@@ -65 +68 @@
     CASE(mountain)
        CALL test2_steady_state_mountain(lon,lat,dummy,dummy,0,.TRUE.,hyam,hybm, &
-            ulonj,ulatj,dummy,tempj,phisj,psj,dummy,dummy)
+            ulonj,ulatj,dummy,tempj,phisj,psj,dummy,dummy,h0_test2)
     CASE(schaer_noshear)
        CALL test2_schaer_mountain(lon,lat,dummy,dummy,0,.TRUE.,hyam,hybm,0,&
-            ulonj,ulatj,dummy,tempj,phisj,psj,dummy,dummy)
+            ulonj,ulatj,dummy,tempj,phisj,psj,dummy,dummy,h0_test2,Teq_test2)
     CASE(schaer_shear)
        CALL test2_schaer_mountain(lon,lat,dummy,dummy,0,.TRUE.,hyam,hybm,1, &
-            ulonj,ulatj,dummy,tempj,phisj,psj,dummy,dummy)
+            ulonj,ulatj,dummy,tempj,phisj,psj,dummy,dummy,h0_test2,Teq_test2)
     END SELECT
   END SUBROUTINE comp_all