Changeset 972

Timestamp:

09/19/19 15:57:53 (5 years ago)

Author:

jisesh

Message:

devel: Added option up0 and CASE 'wind_temperature'

Location:

codes/icosagcm/devel/src

Files:

• dissip/nudging_mod.f90 (modified) (1 diff)
• initial/etat0_dcmip4.f90 (modified) (3 diffs)

codes/icosagcm/devel/src/dissip/nudging_mod.f90

@@ -254 +254 @@
            ps2 = f_ps(ind)
            CALL compute_guided_center2(coef_i, target_ps, ps2)
+         CASE ('wind_temperature')
+           coef_e = f_relax_coef_e(ind)
+           target_ue = f_target_ue(ind)
+           ue = f_u(ind)
+           CALL compute_guided_u(coef_e, target_ue, ue)
+           coef_i = f_relax_coef_i(ind)
+           target_theta_rhodz = f_target_theta_rhodz(ind)
+           theta_rhodz = f_theta_rhodz(ind)
+           CALL compute_guided_center(coef_i, target_theta_rhodz, theta_rhodz)
          CASE ('wind_temperature_ps')
            coef_e = f_relax_coef_e(ind)

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

@@ -3 +3 @@
   IMPLICIT NONE
   PRIVATE
-  
+  SAVE
+
   REAL(rstd),PARAMETER :: eta0=0.252
   REAL(rstd),PARAMETER :: etat=0.2
@@ -12 +13 @@
   REAL(rstd),PARAMETER :: Rd=287
   REAL(rstd),PARAMETER :: Gamma=0.005
-  REAL(rstd),PARAMETER :: up0=1
   REAL(rstd),PARAMETER :: lonc=Pi/9, latc=2*Pi/9, latw=2*Pi/9
   REAL(rstd),PARAMETER :: pw=34000
   REAL(rstd),PARAMETER :: q0=0.021
+
+  REAL(rstd) :: up0=1.              ! default value, can be modified in run.def
+  !$OMP THREADPRIVATE(up0)
   
-  INTEGER,SAVE :: testcase
-  !$OMP THREADPRIVATE(testcase)  
+  INTEGER :: testcase
+  !$OMP THREADPRIVATE(testcase)
   
   PUBLIC getin_etat0, compute_etat0
@@ -34 +37 @@
     testcase=1
     CALL getin("dcmip4_testcase",testcase)
+    CALL getin("dcmip4_up0",up0)
   END SUBROUTINE getin_etat0