Changeset 32

Timestamp:

07/27/12 16:04:22 (12 years ago)

Author:

ymipsl

Message:

externalize earth constant in run.def and add scalling factor functionnality

YM

Location:

codes/icosagcm/trunk/src

Files:

• caldyn_gcm.f90 (modified) (1 diff)
• dissip_gcm.f90 (modified) (3 diffs)
• earth_const.f90 (modified) (1 diff)
• icosa_gcm.f90 (modified) (1 diff)
• timeloop_gcm.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -24 +24 @@
     CALL allocate_caldyn
     CALL getin('write_period',write_period)
+    write_period=write_period/scale_factor
     
     itau_out=INT(write_period/dt)

codes/icosagcm/trunk/src/dissip_gcm.f90

@@ -79 +79 @@
     tau_graddiv(:)=5000
     CALL getin("tau_graddiv",tau)
-    tau_graddiv(:)=tau
+    tau_graddiv(:)=tau/scale_factor
 
     CALL getin("nitergdiv",nitergdiv)
@@ -85 +85 @@
     tau_gradrot(:)=5000
     CALL getin("tau_gradrot",tau_gradrot)
-    tau_gradrot(:)=tau
+    tau_gradrot(:)=tau/scale_factor
 
     CALL getin("nitergrot",nitergrot)
@@ -92 +92 @@
     tau_divgrad(:)=5000
     CALL getin("tau_divgrad",tau)
-    tau_divgrad(:)=tau
+    tau_divgrad(:)=tau/scale_factor
 
     CALL getin("niterdivgrad",niterdivgrad)

codes/icosagcm/trunk/src/earth_const.f90

@@ -3 +3 @@
   USE math_const
   
-  REAL(rstd),PARAMETER :: radius=6.37122E6
-!  REAL(rstd),PARAMETER :: radius=1.
-  REAL(rstd),PARAMETER :: g=9.80616
+  REAL(rstd),SAVE :: radius=6.37122E6
+  REAL(rstd),SAVE :: g=9.80616
   REAL(rstd),PARAMETER :: daysec=86400
-!  REAL(rstd),PARAMETER :: omega=2*Pi/daysec
-  REAL(rstd),PARAMETER :: omega=7.292E-5
-!  REAL(rstd),PARAMETER :: omega=0
-  REAL(rstd),PARAMETER :: kappa=0.2857143
-  REAL(rstd),PARAMETER :: cpp=1004.70885
-  REAL(rstd),PARAMETER :: preff=101325.
-  REAL(rstd),PARAMETER :: pa=50000.  
+  REAL(rstd),SAVE :: omega=7.292E-5
+  REAL(rstd),SAVE :: kappa=0.2857143
+  REAL(rstd),SAVE :: cpp=1004.70885
+  REAL(rstd),SAVE :: preff=101325.
+  REAL(rstd),SAVE :: pa=50000.
+  REAL(rstd),SAVE :: scale_factor=1.
 
+CONTAINS
+  
+  SUBROUTINE init_earth_const
+  USE ioipsl
+  IMPLICIT NONE
+  REAL(rstd) :: X=1
+  
+    CALL getin("radius",radius)
+    CALL getin("g",g)
+    CALL getin("X",scale_factor)
+    CALL getin("omega",omega)  
+    CALL getin("kappa",kappa)  
+    CALL getin("cpp",cpp)  
+    CALL getin("preff",preff)  
+    
+    radius=radius/scale_factor
+    omega=omega/scale_factor
+    PRINT *,"radius = ",radius
+    
+  END SUBROUTINE init_earth_const
+  
+  
 END MODULE earth_const
   

codes/icosagcm/trunk/src/icosa_gcm.f90

@@ -18 +18 @@
  
   CALL init_mpipara
-  
+  CALL init_earth_const 
   CALL init_grid_param
   CALL compute_metric

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -44 +44 @@
   dt=90.
   CALL getin('dt',dt)
-
+  dt=dt/scale_factor
+  
   itaumax=100
   CALL getin('itaumax',itaumax)
@@ -50 +51 @@
   write_period=0
   CALL getin('write_period',write_period)
+  write_period=write_period/scale_factor
+  
   itau_out=INT(write_period/dt)
   
@@ -93 +96 @@
   
   CALL etat0(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
+  
+  CALL writefield('ps',f_ps)
+  CALL writefield('theta_rhodz',f_theta_rhodz)
   
   DO it=0,itaumax