Changeset 1036 for trunk/LMDZ.MARS/libf/phymars/updaterad.F90

Timestamp:

Sep 11, 2013, 2:34:44 PM (11 years ago)

Author:

emillour

Message:

Mars GCM: (a first step towards using parallel dynamics)

• IMPORTANT CHANGE: Implemented dynamic tracers. It is no longer necessary to compile the model with the '-t #' option, number of tracers is simply read from tracer.def file (as before). Adapted makegcm_* scripts (and co.) accordingly. Technical aspects of the switch to dynamic tracers are:
  • advtrac.h (in dyn3d) removed and replaced by module infotrac.F
  • tracer.h (in phymars) removed and replaced by module tracer_mod.F90 (which contains nqmx, the number of tracers, etc. and can be used anywhere in the physics).
• Included some side cleanups: removed unused files (in dyn3d) anldoppler2.F, anl_mcdstats.F and anl_stats-diag.F, and all the unecessary dimensions.* files in grid/dimension.
• Checked that changes are clean and that GCM yields identical results (in debug mode) to previous svn version.

EM

File:

• trunk/LMDZ.MARS/libf/phymars/updaterad.F90 (modified) (4 diffs)

trunk/LMDZ.MARS/libf/phymars/updaterad.F90

@@ -62 +62 @@
 ! Update ice radius if microphys == true 
 subroutine updaterice_micro(qice,qccn,nccn,coeff,rice,rhocloud)
-implicit none
-
-#include "dimensions.h"
-#include "dimphys.h"
-#include "comcstfi.h"
-#include "tracer.h"
+use tracer_mod, only: rho_dust, rho_ice
+implicit none
+
+#include "dimensions.h"
+#include "dimphys.h"
+#include "comcstfi.h"
+!#include "tracer.h"
 
 real, intent(in)  :: qice,qccn,nccn
@@ -118 +119 @@
 ! Update ice radius from a typical profile if microphys == false
 subroutine updaterice_typ(qice,tau,pzlay,rice)
-implicit none
-
-#include "dimensions.h"
-#include "dimphys.h"
-#include "comcstfi.h"
-#include "tracer.h"
+use tracer_mod, only: rho_ice
+implicit none
+
+#include "dimensions.h"
+#include "dimphys.h"
+#include "comcstfi.h"
+!#include "tracer.h"
 
 real, intent(in)  :: qice
@@ -175 +177 @@
 ! To be used with doubleq == true. otherwise, rdust is constant !!!
 subroutine updaterdust(qdust,ndust,rdust,tauscaling)
-implicit none
-
-#include "dimensions.h"
-#include "dimphys.h"
-#include "comcstfi.h"
-#include "tracer.h"
+use tracer_mod, only: r3n_q
+implicit none
+
+#include "dimensions.h"
+#include "dimphys.h"
+#include "comcstfi.h"
+!#include "tracer.h"
 
 real, intent(in) :: qdust,ndust ! needed if doubleq
@@ -230 +233 @@
 ! geometric mean radius = mass mean radius x exp(-1.5 sigma0^2)
 subroutine updaterccn(qccn,nccn,rccn,tauscaling)
-implicit none
-
-#include "dimensions.h"
-#include "dimphys.h"
-#include "comcstfi.h"
-#include "tracer.h"
+use tracer_mod, only: rho_dust
+implicit none
+
+#include "dimensions.h"
+#include "dimphys.h"
+#include "comcstfi.h"
+!#include "tracer.h"
 
 real, intent(in) :: qccn,nccn ! needed if doubleq