Changeset 3109 for branches/2011/dev_NOC_UKMO_MERGE

Timestamp:

2011-11-15T14:32:34+01:00 (12 years ago)

Author:

acc

Message:

Branch dev_NOC_UKMO_MERGE #890. More tweaks to AMM reference configuration and dynhpg.F90

Location:

branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM

Files:

• CONFIG/AMM12/EXP00/namelist (modified) (1 diff)
• CONFIG/AMM12_PISCES/EXP00/namelist (modified) (1 diff)
• NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) (1 diff)
• SETTE/input_AMM12.cfg (added)
• SETTE/input_AMM12_PISCES.cfg (added)
• SETTE/sette.sh (modified) (1 diff)

branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12/EXP00/namelist

@@ -30 +30 @@
    nn_date0    =  20070101 !  initial calendar date yymmdd (used if nn_rstctl=1)
    nn_leapy    =       1   !  Leap year calendar (1) or not (0)
-   ln_rstart   =  .true.   !  start from rest (F) or from a restart file (T)
+   ln_rstart   =  .false.  !  start from rest (F) or from a restart file (T)
    nn_rstctl   =       0       !  restart control = 0 nn_it000 is not compared to the restart file value
                                !                  = 1 use nn_date0 in namelist (not the value in the restart file)

branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist

@@ -30 +30 @@
    nn_date0    =  20070101 !  initial calendar date yymmdd (used if nn_rstctl=1)
    nn_leapy    =       1   !  Leap year calendar (1) or not (0)
-   ln_rstart   =  .true.   !  start from rest (F) or from a restart file (T)
+   ln_rstart   =  .false.  !  start from rest (F) or from a restart file (T)
    nn_rstctl   =       0       !  restart control = 0 nn_it000 is not compared to the restart file value
                                !                  = 1 use nn_date0 in namelist (not the value in the restart file)

branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -700 +700 @@
 
       ! Clean 3-D work arrays
-      zhpi(:,:,:) = 0.
+      zhpi(:,:,:) = 0._wp
+      zrhh(:,:,:) = rhd(:,:,:)
       
       ! Preparing vertical density profile for hybrid-sco coordinate

branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/SETTE/sette.sh

@@ -415 +415 @@
 
 if [ ${config} -eq 9 ] ;  then
-# Restartability tests for AMM12
-    export TEST_NAME="LONG"
-    cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -m ${CMP_NAM} -n AMM12 -r AMM12
-    cd ${SETTE_DIR}
-    . param.cfg
-    . all_functions.sh
-    . prepare_exe_dir.sh
-    cd ${EXE_DIR}
-    set_namelist namelist cn_exp \"AMM12_LONG\"
-    set_namelist namelist nn_it000 1
-    set_namelist namelist nn_itend 120
-    set_namelist namelist nn_stock 60
-    set_namelist namelist ln_clobber .true.
-    cd ${SETTE_DIR}
-    . ./fcm_job.sh input_AMM12.cfg 1 ${TEST_NAME}
-
-    cd ${SETTE_DIR}
-    export TEST_NAME="SHORT"
-    . prepare_exe_dir.sh
-    cd ${EXE_DIR}
-    set_namelist namelist cn_exp \"AMM12_SHORT\"
-    set_namelist namelist nn_it000 61
-    set_namelist namelist nn_itend 120
-    set_namelist namelist nn_stock 60
-    set_namelist namelist ln_rstart .true.
-    set_namelist namelist nn_rstctl 2
-    set_namelist namelist ln_clobber .true.
-    cp ..\/LONG\/AMM12_LONG_00000060_restart.nc .
-    set_namelist namelist cn_ocerst_in \"AMM12_LONG_00000060_restart.nc\"
-    cd ${SETTE_DIR}
-    . ./fcm_job.sh input_AMM12.cfg 1 ${TEST_NAME}
+    ## Reproductibility tests for AMM12
+    cd ${SETTE_DIR}
+    . ../CONFIG/makenemo -m ${CMP_NAM} -n AMM12_32 -r AMM12 add_key "key_mpp_mpi key_mpp_rep"
+    cd ${SETTE_DIR}
+    . param.cfg
+    . all_functions.sh
+    copy_original namelist
+    set_namelist namelist nn_it000 1
+    set_namelist namelist nn_itend 576
+    set_namelist namelist nn_fwb 0
+    set_namelist namelist ln_ctl .false.
+    set_namelist namelist ln_clobber .true.
+    set_namelist namelist jpni 8
+    set_namelist namelist jpnj 4
+    set_namelist namelist jpnij 32
+    cd ${SETTE_DIR}
+    . ./fcm_job.sh input_AMM12.cfg 32 REPRO_8_4
+
+    cd ${SETTE_DIR}
+    copy_original namelist
+    set_namelist namelist nn_it000 1
+    set_namelist namelist nn_itend 576
+    set_namelist namelist nn_fwb 0
+    set_namelist namelist ln_ctl .false.
+    set_namelist namelist ln_clobber .true.
+    set_namelist namelist jpni 4
+    set_namelist namelist jpnj 8
+    set_namelist namelist jpnij 32
+    cd ${SETTE_DIR}
+    . ./fcm_job.sh input_AMM12.cfg 32 REPRO_4_8
 fi
 done